diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-07-01 10:17:13 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-07-01 10:17:13 -0400 |
| commit | 04bf7869ca0fd12009aee301cac2264a36df4d98 (patch) | |
| tree | 66cb81ebf8b76560a31433c2c493dc430c914af9 /fs/reiserfs/xattr.c | |
| parent | d2f31a5fd60d168b00fc4f7617b68a1287b21e90 (diff) | |
| parent | 7b28afe01ab6ffb5f152f47831b44933facd2328 (diff) | |
Merge branch 'for-linus' into for-3.1/core
Conflicts:
block/blk-throttle.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/reiserfs/xattr.c')
| -rw-r--r-- | fs/reiserfs/xattr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index e8a62f41b458..d78089690965 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
| @@ -954,8 +954,6 @@ static int xattr_mount_check(struct super_block *s) | |||
| 954 | 954 | ||
| 955 | int reiserfs_permission(struct inode *inode, int mask, unsigned int flags) | 955 | int reiserfs_permission(struct inode *inode, int mask, unsigned int flags) |
| 956 | { | 956 | { |
| 957 | if (flags & IPERM_FLAG_RCU) | ||
| 958 | return -ECHILD; | ||
| 959 | /* | 957 | /* |
| 960 | * We don't do permission checks on the internal objects. | 958 | * We don't do permission checks on the internal objects. |
| 961 | * Permissions are determined by the "owning" object. | 959 | * Permissions are determined by the "owning" object. |