Merge branch 'dma-buf-merge' of git://people.freedesktop.org/~airlied/linux

[karo-tx-linux.git] / fs / ocfs2 / xattr.h

diff --git a/fs/ocfs2/xattr.h b/fs/ocfs2/xattr.h
index d63cfb72316b451c59bb15193461137f941109d5..e5c7f15465b49c2b744fe4fca30e107fa1d1ddae 100644 (file)
--- a/fs/ocfs2/xattr.h
+++ b/fs/ocfs2/xattr.h
@@ -68,7 +68,7 @@ int ocfs2_calc_security_init(struct inode *,
                             struct ocfs2_security_xattr_info *,
                             int *, int *, struct ocfs2_alloc_context **);
 int ocfs2_calc_xattr_init(struct inode *, struct buffer_head *,
-                         int, struct ocfs2_security_xattr_info *,
+                         umode_t, struct ocfs2_security_xattr_info *,
                          int *, int *, int *);
 
 /*