Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7ff91d7 authored by Ryota Yamauchi's avatar Ryota Yamauchi Committed by hch@lst.de
Browse files

xfs: fix xfs_quota remove error 



The xfs_quota returns ENOSYS when remove command is executed.
Reproducable with following steps.

    # mount -t xfs -o uquota /dev/sda7 /mnt/mp1
    # xfs_quota -x -c off -c remove
    XFS_QUOTARM: Function not implemented.

The remove command is allowed during quotaoff, but xfs_fs_set_xstate()
checks whether quota is running, and it leads to ENOSYS.

To solve this problem, add a check for X_QUOTARM.

Signed-off-by: default avatarRyota Yamauchi <r-yamauchi@vf.jp.nec.com>
Signed-off-by: default avatarUtako Kusaka <u-kusaka@wm.jp.nec.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3b826386

fs/xfs/linux-2.6/xfs_quotaops.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ xfs_fs_set_xstate( 


	if (sb->s_flags & MS_RDONLY)

		return -EROFS;

	if (!XFS_IS_QUOTA_RUNNING(mp))

	if (op != Q_XQUOTARM && !XFS_IS_QUOTA_RUNNING(mp))

		return -ENOSYS;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;