diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-01 19:48:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-01 19:48:31 -0400 |
| commit | 1b8e94993c4752d98c33903aa836acc15f7e6d5c (patch) | |
| tree | b78cba208f0a193ce6ceebbc146021af4425b4e1 /fs/gfs2 | |
| parent | 12ff47e7f5fb64c566f62e6cf6a3b291c51bd337 (diff) | |
| parent | 206d440f64030b6425841bf7cb38e26a5ea0c382 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
VFS: Reorganise shrink_dcache_for_umount_subtree() after demise of dcache_lock
VFS: Remove dentry->d_lock locking from shrink_dcache_for_umount_subtree()
VFS: Remove detached-dentry counter from shrink_dcache_for_umount_subtree()
switch posix_acl_chmod() to umode_t
switch posix_acl_from_mode() to umode_t
switch posix_acl_equiv_mode() to umode_t *
switch posix_acl_create() to umode_t *
block: initialise bd_super in bdget()
vfs: avoid call to inode_lru_list_del() if possible
vfs: avoid taking inode_hash_lock on pipes and sockets
vfs: conditionally call inode_wb_list_del()
VFS: Fix automount for negative autofs dentries
Btrfs: load the key from the dir item in readdir into a fake dentry
devtmpfs: missing initialialization in never-hit case
hppfs: missing include
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/acl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c index 884c9af0542f..34501b64bc47 100644 --- a/fs/gfs2/acl.c +++ b/fs/gfs2/acl.c | |||
| @@ -72,7 +72,7 @@ struct posix_acl *gfs2_get_acl(struct inode *inode, int type) | |||
| 72 | return gfs2_acl_get(GFS2_I(inode), type); | 72 | return gfs2_acl_get(GFS2_I(inode), type); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | static int gfs2_set_mode(struct inode *inode, mode_t mode) | 75 | static int gfs2_set_mode(struct inode *inode, umode_t mode) |
| 76 | { | 76 | { |
| 77 | int error = 0; | 77 | int error = 0; |
| 78 | 78 | ||
| @@ -117,7 +117,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode) | |||
| 117 | { | 117 | { |
| 118 | struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode); | 118 | struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode); |
| 119 | struct posix_acl *acl; | 119 | struct posix_acl *acl; |
| 120 | mode_t mode = inode->i_mode; | 120 | umode_t mode = inode->i_mode; |
| 121 | int error = 0; | 121 | int error = 0; |
| 122 | 122 | ||
| 123 | if (!sdp->sd_args.ar_posix_acl) | 123 | if (!sdp->sd_args.ar_posix_acl) |
| @@ -276,7 +276,7 @@ static int gfs2_xattr_system_set(struct dentry *dentry, const char *name, | |||
| 276 | goto out_release; | 276 | goto out_release; |
| 277 | 277 | ||
| 278 | if (type == ACL_TYPE_ACCESS) { | 278 | if (type == ACL_TYPE_ACCESS) { |
| 279 | mode_t mode = inode->i_mode; | 279 | umode_t mode = inode->i_mode; |
| 280 | error = posix_acl_equiv_mode(acl, &mode); | 280 | error = posix_acl_equiv_mode(acl, &mode); |
| 281 | 281 | ||
| 282 | if (error <= 0) { | 282 | if (error <= 0) { |