diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 02:55:32 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:02 -0500 |
commit | 67697cbdccb8b63eae892a9437bcc79d08b79578 (patch) | |
tree | 6c14fa996532e314de662f36d9ef5e1410f7ffde /fs/ocfs2 | |
parent | 2b15ad068418a91687c2d5819c6c03c227d391f2 (diff) |
ocfs2: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/dlmfs/dlmfs.c | 4 | ||||
-rw-r--r-- | fs/ocfs2/namei.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/xattr.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/xattr.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index 9e1090b8dd3b..abfac0d7ae9c 100644 --- 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 = { | |||
400 | static struct inode *dlmfs_get_root_inode(struct super_block *sb) | 400 | static struct inode *dlmfs_get_root_inode(struct super_block *sb) |
401 | { | 401 | { |
402 | struct inode *inode = new_inode(sb); | 402 | struct inode *inode = new_inode(sb); |
403 | int mode = S_IFDIR | 0755; | 403 | umode_t mode = S_IFDIR | 0755; |
404 | struct dlmfs_inode_private *ip; | 404 | struct dlmfs_inode_private *ip; |
405 | 405 | ||
406 | if (inode) { | 406 | if (inode) { |
@@ -421,7 +421,7 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb) | |||
421 | 421 | ||
422 | static struct inode *dlmfs_get_inode(struct inode *parent, | 422 | static struct inode *dlmfs_get_inode(struct inode *parent, |
423 | struct dentry *dentry, | 423 | struct dentry *dentry, |
424 | int mode) | 424 | umode_t mode) |
425 | { | 425 | { |
426 | struct super_block *sb = parent->i_sb; | 426 | struct super_block *sb = parent->i_sb; |
427 | struct inode * inode = new_inode(sb); | 427 | struct inode * inode = new_inode(sb); |
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 11c62e20054c..be244692550d 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
@@ -185,7 +185,7 @@ bail: | |||
185 | return ret; | 185 | return ret; |
186 | } | 186 | } |
187 | 187 | ||
188 | static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode) | 188 | static struct inode *ocfs2_get_init_inode(struct inode *dir, umode_t mode) |
189 | { | 189 | { |
190 | struct inode *inode; | 190 | struct inode *inode; |
191 | 191 | ||
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index aa9e8777b09a..0ba9ea1e7961 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c | |||
@@ -623,7 +623,7 @@ int ocfs2_calc_security_init(struct inode *dir, | |||
623 | 623 | ||
624 | int ocfs2_calc_xattr_init(struct inode *dir, | 624 | int ocfs2_calc_xattr_init(struct inode *dir, |
625 | struct buffer_head *dir_bh, | 625 | struct buffer_head *dir_bh, |
626 | int mode, | 626 | umode_t mode, |
627 | struct ocfs2_security_xattr_info *si, | 627 | struct ocfs2_security_xattr_info *si, |
628 | int *want_clusters, | 628 | int *want_clusters, |
629 | int *xattr_credits, | 629 | int *xattr_credits, |
diff --git a/fs/ocfs2/xattr.h b/fs/ocfs2/xattr.h index d63cfb72316b..e5c7f15465b4 100644 --- a/fs/ocfs2/xattr.h +++ b/fs/ocfs2/xattr.h | |||
@@ -68,7 +68,7 @@ int ocfs2_calc_security_init(struct inode *, | |||
68 | struct ocfs2_security_xattr_info *, | 68 | struct ocfs2_security_xattr_info *, |
69 | int *, int *, struct ocfs2_alloc_context **); | 69 | int *, int *, struct ocfs2_alloc_context **); |
70 | int ocfs2_calc_xattr_init(struct inode *, struct buffer_head *, | 70 | int ocfs2_calc_xattr_init(struct inode *, struct buffer_head *, |
71 | int, struct ocfs2_security_xattr_info *, | 71 | umode_t, struct ocfs2_security_xattr_info *, |
72 | int *, int *, int *); | 72 | int *, int *, int *); |
73 | 73 | ||
74 | /* | 74 | /* |