ocfs2: propagate umode_t

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c
index 9e1090b8dd3bed9191cb5f3e427b1656f5167220..abfac0d7ae9c7a03621a922d7960a4ce22abd121 100644 (file)
--- a/fs/ocfs2/dlmfs/dlmfs.c
+++ b/fs/ocfs2/dlmfs/dlmfs.c
@@ -400,7 +400,7 @@ static struct backing_dev_info dlmfs_backing_dev_info = {
 static struct inode *dlmfs_get_root_inode(struct super_block *sb)
 {
        struct inode *inode = new_inode(sb);
-       int mode = S_IFDIR | 0755;
+       umode_t mode = S_IFDIR | 0755;
        struct dlmfs_inode_private *ip;
 
        if (inode) {
@@ -421,7 +421,7 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb)
 
 static struct inode *dlmfs_get_inode(struct inode *parent,
                                     struct dentry *dentry,
-                                    int mode)
+                                    umode_t mode)
 {
        struct super_block *sb = parent->i_sb;
        struct inode * inode = new_inode(sb);

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 11c62e20054cc4f96186319b10618a4b7ef8d517..be244692550db3e18cf05987ff577717e1f33173 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -185,7 +185,7 @@ bail:
        return ret;
 }
 
-static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode)
+static struct inode *ocfs2_get_init_inode(struct inode *dir, umode_t mode)
 {
        struct inode *inode;
 

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,

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 *);
 
 /*