diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-02-16 03:44:51 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-03-04 18:20:24 -0500 |
commit | 8c4e4acd660a09e571a71583b5bbe1eee700c9ad (patch) | |
tree | 05d1208e70d96dfa6857dbb84de7f3554a721992 /fs/xfs/linux-2.6 | |
parent | c988afb5fa3fc450207c3dfc0ce535f4bfdae4d1 (diff) |
quota: clean up Q_XQUOTASYNC
Currently Q_XQUOTASYNC calls into the quota_sync method, but XFS does something
entirely different in it than the rest of the filesystems. xfs_quota which
calls Q_XQUOTASYNC expects an asynchronous data writeout to flush delayed
allocations, while the "VFS" quota support wants to flush changes to the quota
file.
So make Q_XQUOTASYNC call into the writeback code directly and make the
quota_sync method optional as XFS doesn't need in the sense expected by the
rest of the quota code.
GFS2 was using limited XFS-style quota and has a quota_sync method fitting
neither the style used by vfs_quota_sync nor xfs_fs_quota_sync. I left it
in for now as per discussion with Steve it expects to be called from the
sync path this way.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/xfs/linux-2.6')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_quotaops.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/fs/xfs/linux-2.6/xfs_quotaops.c b/fs/xfs/linux-2.6/xfs_quotaops.c index 3d4a0c84d634..07d67c624922 100644 --- a/fs/xfs/linux-2.6/xfs_quotaops.c +++ b/fs/xfs/linux-2.6/xfs_quotaops.c | |||
@@ -44,20 +44,6 @@ xfs_quota_type(int type) | |||
44 | } | 44 | } |
45 | 45 | ||
46 | STATIC int | 46 | STATIC int |
47 | xfs_fs_quota_sync( | ||
48 | struct super_block *sb, | ||
49 | int type) | ||
50 | { | ||
51 | struct xfs_mount *mp = XFS_M(sb); | ||
52 | |||
53 | if (sb->s_flags & MS_RDONLY) | ||
54 | return -EROFS; | ||
55 | if (!XFS_IS_QUOTA_RUNNING(mp)) | ||
56 | return -ENOSYS; | ||
57 | return -xfs_sync_data(mp, 0); | ||
58 | } | ||
59 | |||
60 | STATIC int | ||
61 | xfs_fs_get_xstate( | 47 | xfs_fs_get_xstate( |
62 | struct super_block *sb, | 48 | struct super_block *sb, |
63 | struct fs_quota_stat *fqs) | 49 | struct fs_quota_stat *fqs) |
@@ -151,7 +137,6 @@ xfs_fs_set_xquota( | |||
151 | } | 137 | } |
152 | 138 | ||
153 | const struct quotactl_ops xfs_quotactl_operations = { | 139 | const struct quotactl_ops xfs_quotactl_operations = { |
154 | .quota_sync = xfs_fs_quota_sync, | ||
155 | .get_xstate = xfs_fs_get_xstate, | 140 | .get_xstate = xfs_fs_get_xstate, |
156 | .set_xstate = xfs_fs_set_xstate, | 141 | .set_xstate = xfs_fs_set_xstate, |
157 | .get_xquota = xfs_fs_get_xquota, | 142 | .get_xquota = xfs_fs_get_xquota, |