diff options
Diffstat (limited to 'fs/ext3')
-rw-r--r-- | fs/ext3/acl.c | 2 | ||||
-rw-r--r-- | fs/ext3/ioctl.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c index 1e5038d9a01b..d34e9967430a 100644 --- a/fs/ext3/acl.c +++ b/fs/ext3/acl.c | |||
@@ -489,7 +489,7 @@ ext3_xattr_set_acl(struct inode *inode, int type, const void *value, | |||
489 | 489 | ||
490 | if (!test_opt(inode->i_sb, POSIX_ACL)) | 490 | if (!test_opt(inode->i_sb, POSIX_ACL)) |
491 | return -EOPNOTSUPP; | 491 | return -EOPNOTSUPP; |
492 | if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) | 492 | if (!is_owner_or_cap(inode)) |
493 | return -EPERM; | 493 | return -EPERM; |
494 | 494 | ||
495 | if (value) { | 495 | if (value) { |
diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c index 965006dba6be..4a2a02c95bf9 100644 --- a/fs/ext3/ioctl.c +++ b/fs/ext3/ioctl.c | |||
@@ -41,7 +41,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, | |||
41 | if (IS_RDONLY(inode)) | 41 | if (IS_RDONLY(inode)) |
42 | return -EROFS; | 42 | return -EROFS; |
43 | 43 | ||
44 | if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) | 44 | if (!is_owner_or_cap(inode)) |
45 | return -EACCES; | 45 | return -EACCES; |
46 | 46 | ||
47 | if (get_user(flags, (int __user *) arg)) | 47 | if (get_user(flags, (int __user *) arg)) |
@@ -122,7 +122,7 @@ flags_err: | |||
122 | __u32 generation; | 122 | __u32 generation; |
123 | int err; | 123 | int err; |
124 | 124 | ||
125 | if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) | 125 | if (!is_owner_or_cap(inode)) |
126 | return -EPERM; | 126 | return -EPERM; |
127 | if (IS_RDONLY(inode)) | 127 | if (IS_RDONLY(inode)) |
128 | return -EROFS; | 128 | return -EROFS; |
@@ -181,7 +181,7 @@ flags_err: | |||
181 | if (IS_RDONLY(inode)) | 181 | if (IS_RDONLY(inode)) |
182 | return -EROFS; | 182 | return -EROFS; |
183 | 183 | ||
184 | if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) | 184 | if (!is_owner_or_cap(inode)) |
185 | return -EACCES; | 185 | return -EACCES; |
186 | 186 | ||
187 | if (get_user(rsv_window_size, (int __user *)arg)) | 187 | if (get_user(rsv_window_size, (int __user *)arg)) |