ocfs2: propagate umode_t

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit 67697cbdccb8b63eae892a9437bcc79d08b79578)

Signed-off-by: Xiaowei.Hu <xiaowei.hu@oracle.com>

diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c
index 8336e62773bc103fc7f63c04637e0f6ead510d46..5a367fa269aa49420d8cdd118dc07cefb1ab84da 100644 (file)
--- a/fs/ocfs2/dlmfs/dlmfs.c
+++ b/fs/ocfs2/dlmfs/dlmfs.c
@@ -401,7 +401,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) {
@@ -422,7 +422,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 8cc374e5e981005e79aab624968b9b55b51c7149..be4903f8378c74d9174b9cb314f87609baa68820 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 93d6c80b39228134be20ce2f4ab60601c204d069..dce35ddcf3008868939fc68eb46bc73b1f3473c1 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 *);
 
 /*