Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / fs / ocfs2 / xattr.h

diff --git a/fs/ocfs2/xattr.h b/fs/ocfs2/xattr.h
index 5a1ebc789f7eff51d8e364217171c3b0188983a8..1ca7e9a1b7bccbf4b34c270c7cc2009b53e3d370 100644 (file)
--- a/fs/ocfs2/xattr.h
+++ b/fs/ocfs2/xattr.h
@@ -68,7 +68,7 @@ int ocfs2_calc_security_init(struct inode *,
                             int *, int *, struct ocfs2_alloc_context **);
 int ocfs2_calc_xattr_init(struct inode *, struct buffer_head *,
                          int, struct ocfs2_security_xattr_info *,
-                         int *, int *, struct ocfs2_alloc_context **);
+                         int *, int *, int *);
 
 /*
  * xattrs can live inside an inode, as part of an external xattr block,