diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2016-05-03 16:33:43 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-05-03 17:41:30 +0200 |
| commit | 928efcfeabf11efc514cd8871a8debec9520467f (patch) | |
| tree | 998ba7a082a0f2a8c95cd98710147e07053bb1d3 /fs | |
| parent | 6fa6f0c4ca2752a42bb03b41bffb4556b5ccec8c (diff) | |
| download | lwn-928efcfeabf11efc514cd8871a8debec9520467f.tar.gz lwn-928efcfeabf11efc514cd8871a8debec9520467f.zip | |
Revert "xfs: add capability check to free eofblocks ioctl"
This reverts commit eaeeaec383f3228446715e660851f73423501eba, upstream
commit 8c567a7fab6e086a0284eee2db82348521e7120c.
It was (mis)applied twice to stable-3.12.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Brian Foster <bfoster@redhat.com>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Gao feng <gaofeng@cn.fujitsu.com>
Cc: Dwight Engen <dwight.engen@oracle.com>
Cc: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 52b5375faedc..93a5e91796e9 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1718,12 +1718,6 @@ xfs_file_ioctl( if (mp->m_flags & XFS_MOUNT_RDONLY) return -XFS_ERROR(EROFS); - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - if (mp->m_flags & XFS_MOUNT_RDONLY) - return -XFS_ERROR(EROFS); - if (copy_from_user(&eofb, arg, sizeof(eofb))) return -XFS_ERROR(EFAULT); |