diff --git a/[refs] b/[refs] index 1596f1e970f8..a673da8fa077 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89605011915aec5c6194e53a9f02631d68aea6bc +refs/heads/master: 4b217ed9e30f94b6e8e5e262020ef0ceab6113af diff --git a/trunk/fs/quota/quota.c b/trunk/fs/quota/quota.c index 7898cd688a00..7a9bedeb1d57 100644 --- a/trunk/fs/quota/quota.c +++ b/trunk/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;