3.12-stable review patch. If anyone has any objections, please let me know.
=============== This reverts commit eaeeaec383f3228446715e660851f73423501eba, upstream commit 8c567a7fab6e086a0284eee2db82348521e7120c. It was (mis)applied twice to stable-3.12. Signed-off-by: Jiri Slaby <[email protected]> Cc: Brian Foster <[email protected]> Cc: Dave Chinner <[email protected]> Cc: Gao feng <[email protected]> Cc: Dwight Engen <[email protected]> Cc: Ben Myers <[email protected]> --- fs/xfs/xfs_ioctl.c | 6 ------ 1 file changed, 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); -- 2.8.2
