xfs
[Top] [All Lists]

[PATCH 05/10] quota: clean up Q_XQUOTASYNC

To: jack@xxxxxxx
Subject: [PATCH 05/10] quota: clean up Q_XQUOTASYNC
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Tue, 16 Feb 2010 03:44:51 -0500
Cc: swhiteho@xxxxxxxxxx, linux-fsdevel@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx
References: <20100216084446.377980079@xxxxxxxxxxxxxxxxxxxxxx>
User-agent: quilt/0.47-1
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@xxxxxx>

Index: linux-2.6/fs/quota/quota.c
===================================================================
--- linux-2.6.orig/fs/quota/quota.c     2010-02-16 00:15:27.136003612 +0100
+++ linux-2.6/fs/quota/quota.c  2010-02-16 00:16:03.263004031 +0100
@@ -18,6 +18,7 @@
 #include <linux/capability.h>
 #include <linux/quotaops.h>
 #include <linux/types.h>
+#include <linux/writeback.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
 
@@ -52,7 +53,7 @@ void sync_quota_sb(struct super_block *s
 {
        int cnt;
 
-       if (!sb->s_qcop->quota_sync)
+       if (!sb->s_qcop || !sb->s_qcop->quota_sync)
                return;
 
        sb->s_qcop->quota_sync(sb, type);
@@ -318,9 +319,11 @@ static int do_quotactl(struct super_bloc
        case Q_XGETQUOTA:
                return quota_getxquota(sb, type, id, addr);
        case Q_XQUOTASYNC:
-               if (!sb->s_qcop->quota_sync)
-                       return -ENOSYS;
-               return sb->s_qcop->quota_sync(sb, type);
+               /* caller already holds s_umount */
+               if (sb->s_flags & MS_RDONLY)
+                       return -EROFS;
+               writeback_inodes_sb(sb);
+               return 0;
        default:
                return -EINVAL;
        }
Index: linux-2.6/fs/xfs/linux-2.6/xfs_quotaops.c
===================================================================
--- linux-2.6.orig/fs/xfs/linux-2.6/xfs_quotaops.c      2010-02-16 
00:13:44.399004869 +0100
+++ linux-2.6/fs/xfs/linux-2.6/xfs_quotaops.c   2010-02-16 00:15:27.709004380 
+0100
@@ -44,20 +44,6 @@ xfs_quota_type(int type)
 }
 
 STATIC int
-xfs_fs_quota_sync(
-       struct super_block      *sb,
-       int                     type)
-{
-       struct xfs_mount        *mp = XFS_M(sb);
-
-       if (sb->s_flags & MS_RDONLY)
-               return -EROFS;
-       if (!XFS_IS_QUOTA_RUNNING(mp))
-               return -ENOSYS;
-       return -xfs_sync_data(mp, 0);
-}
-
-STATIC int
 xfs_fs_get_xstate(
        struct super_block      *sb,
        struct fs_quota_stat    *fqs)
@@ -151,7 +137,6 @@ xfs_fs_set_xquota(
 }
 
 const struct quotactl_ops xfs_quotactl_operations = {
-       .quota_sync             = xfs_fs_quota_sync,
        .get_xstate             = xfs_fs_get_xstate,
        .set_xstate             = xfs_fs_set_xstate,
        .get_xquota             = xfs_fs_get_xquota,
Index: linux-2.6/include/linux/quotaops.h
===================================================================
--- linux-2.6.orig/include/linux/quotaops.h     2010-02-16 00:16:06.788003612 
+0100
+++ linux-2.6/include/linux/quotaops.h  2010-02-16 00:16:15.361004730 +0100
@@ -22,7 +22,7 @@ static inline struct quota_info *sb_dqop
 void sync_quota_sb(struct super_block *sb, int type);
 static inline void writeout_quota_sb(struct super_block *sb, int type)
 {
-       if (sb->s_qcop->quota_sync)
+       if (sb->s_qcop && sb->s_qcop->quota_sync)
                sb->s_qcop->quota_sync(sb, type);
 }
 

<Prev in Thread] Current Thread [Next in Thread>