Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next

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

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index aa9e8777b09a5e345b081b0e495db378485a30e7..0ba9ea1e7961f8fa9f357853763f2514aa21a1b9 100644 (file)
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -623,7 +623,7 @@ int ocfs2_calc_security_init(struct inode *dir,
 
 int ocfs2_calc_xattr_init(struct inode *dir,
                          struct buffer_head *dir_bh,
-                         int mode,
+                         umode_t mode,
                          struct ocfs2_security_xattr_info *si,
                          int *want_clusters,
                          int *xattr_credits,