Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi

[firefly-linux-kernel-4.4.55.git] / fs / quota / quota.c

diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index fc2c4388d1262a1771d27acb7c55507369cf0dba..9a391204ca278e4186300215ef521183af70eb68 100644 (file)
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -282,10 +282,9 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
        case Q_XGETQUOTA:
                return quota_getxquota(sb, type, id, addr);
        case Q_XQUOTASYNC:
-               /* caller already holds s_umount */
                if (sb->s_flags & MS_RDONLY)
                        return -EROFS;
-               writeback_inodes_sb(sb, WB_REASON_SYNC);
+               /* XFS quotas are fully coherent now, making this call a noop */
                return 0;
        default:
                return -EINVAL;