no explicit xfs_iflush for special inodes during unmount

Currently we explicitly call xfs_iflush on the quota, real-time and root
inodes from xfs_unmount_flush.  But we just called xfs_sync_inodes with
SYNC_ATTR and do an XFS_bflush aka xfs_flush_buftarg to make sure all inodes
are on disk already, so there is no need for these special cases.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>

diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h
index fb49e0f..314ca18 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/fs/xfs/linux-2.6/xfs_vnode.h
@@ -65,11 +65,6 @@ extern void  vn_iowait(struct xfs_inode *ip);
 extern void    vn_iowake(struct xfs_inode *ip);
 extern void    vn_ioerror(struct xfs_inode *ip, int error, char *f, int l);
 
-static inline int vn_count(struct inode *vp)
-{
-       return atomic_read(&vp->i_count);
-}
-
 #define IHOLD(ip) \
 do { \
        ASSERT(atomic_read(&VFS_I(ip)->i_count) > 0) ; \

diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index 5b198d1..6b13960 100644 (file)
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
@@ -395,13 +395,10 @@ xfs_qm_mount_quotas(
 /*
  * Called from the vfsops layer.
  */
-int
+void
 xfs_qm_unmount_quotas(
        xfs_mount_t     *mp)
 {
-       xfs_inode_t     *uqp, *gqp;
-       int             error = 0;
-
        /*
         * Release the dquots that root inode, et al might be holding,
         * before we flush quotas and blow away the quotainfo structure.
@@ -414,43 +411,18 @@ xfs_qm_unmount_quotas(
                xfs_qm_dqdetach(mp->m_rsumip);
 
        /*
-        * Flush out the quota inodes.
+        * Release the quota inodes.
         */
-       uqp = gqp = NULL;
        if (mp->m_quotainfo) {
-               if ((uqp = mp->m_quotainfo->qi_uquotaip) != NULL) {
-                       xfs_ilock(uqp, XFS_ILOCK_EXCL);
-                       xfs_iflock(uqp);
-                       error = xfs_iflush(uqp, XFS_IFLUSH_SYNC);
-                       xfs_iunlock(uqp, XFS_ILOCK_EXCL);
-                       if (unlikely(error == EFSCORRUPTED)) {
-                               XFS_ERROR_REPORT("xfs_qm_unmount_quotas(1)",
-                                                XFS_ERRLEVEL_LOW, mp);
-                               goto out;
-                       }
+               if (mp->m_quotainfo->qi_uquotaip) {
+                       IRELE(mp->m_quotainfo->qi_uquotaip);
+                       mp->m_quotainfo->qi_uquotaip = NULL;
                }
-               if ((gqp = mp->m_quotainfo->qi_gquotaip) != NULL) {
-                       xfs_ilock(gqp, XFS_ILOCK_EXCL);
-                       xfs_iflock(gqp);
-                       error = xfs_iflush(gqp, XFS_IFLUSH_SYNC);
-                       xfs_iunlock(gqp, XFS_ILOCK_EXCL);
-                       if (unlikely(error == EFSCORRUPTED)) {
-                               XFS_ERROR_REPORT("xfs_qm_unmount_quotas(2)",
-                                                XFS_ERRLEVEL_LOW, mp);
-                               goto out;
-                       }
+               if (mp->m_quotainfo->qi_gquotaip) {
+                       IRELE(mp->m_quotainfo->qi_gquotaip);
+                       mp->m_quotainfo->qi_gquotaip = NULL;
                }
        }
-       if (uqp) {
-                IRELE(uqp);
-                mp->m_quotainfo->qi_uquotaip = NULL;
-       }
-       if (gqp) {
-               IRELE(gqp);
-               mp->m_quotainfo->qi_gquotaip = NULL;
-       }
-out:
-       return XFS_ERROR(error);
 }
 
 /*

diff --git a/fs/xfs/quota/xfs_qm.h b/fs/xfs/quota/xfs_qm.h
index 4f2de97..ddf0916 100644 (file)
--- a/fs/xfs/quota/xfs_qm.h
+++ b/fs/xfs/quota/xfs_qm.h
@@ -167,7 +167,7 @@ extern void         xfs_qm_destroy_quotainfo(xfs_mount_t *);
 extern void            xfs_qm_mount_quotas(xfs_mount_t *);
 extern int             xfs_qm_quotacheck(xfs_mount_t *);
 extern void            xfs_qm_unmount_quotadestroy(xfs_mount_t *);
-extern int             xfs_qm_unmount_quotas(xfs_mount_t *);
+extern void            xfs_qm_unmount_quotas(xfs_mount_t *);
 extern int             xfs_qm_write_sb_changes(xfs_mount_t *, __int64_t);
 extern int             xfs_qm_sync(xfs_mount_t *, int);
 

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 2ab2df5..4f64fd1 100644 (file)
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -117,7 +117,7 @@ struct xfs_quotainfo;
 
 typedef int    (*xfs_qminit_t)(struct xfs_mount *, uint *, uint *);
 typedef int    (*xfs_qmmount_t)(struct xfs_mount *, uint, uint);
-typedef int    (*xfs_qmunmount_t)(struct xfs_mount *);
+typedef void   (*xfs_qmunmount_t)(struct xfs_mount *);
 typedef void   (*xfs_qmdone_t)(struct xfs_mount *);
 typedef void   (*xfs_dqrele_t)(struct xfs_dquot *);
 typedef int    (*xfs_dqattach_t)(struct xfs_inode *, uint);

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index cad3da3..559fb8d 100644 (file)
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -68,74 +68,16 @@ xfs_unmount_flush(
                                           rid of. */
        int             relocation)     /* Called from vfs relocation. */
 {
-       xfs_inode_t     *rip = mp->m_rootip;
-       xfs_inode_t     *rbmip;
-       xfs_inode_t     *rsumip = NULL;
-       int             error;
-
-       xfs_ilock(rip, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT);
-       xfs_iflock(rip);
-
-       /*
-        * Flush out the real time inodes.
-        */
-       if ((rbmip = mp->m_rbmip) != NULL) {
-               xfs_ilock(rbmip, XFS_ILOCK_EXCL);
-               xfs_iflock(rbmip);
-               error = xfs_iflush(rbmip, XFS_IFLUSH_SYNC);
-               xfs_iunlock(rbmip, XFS_ILOCK_EXCL);
-
-               if (error == EFSCORRUPTED)
-                       goto fscorrupt_out;
-
-               ASSERT(vn_count(VFS_I(rbmip)) == 1);
-
-               rsumip = mp->m_rsumip;
-               xfs_ilock(rsumip, XFS_ILOCK_EXCL);
-               xfs_iflock(rsumip);
-               error = xfs_iflush(rsumip, XFS_IFLUSH_SYNC);
-               xfs_iunlock(rsumip, XFS_ILOCK_EXCL);
-
-               if (error == EFSCORRUPTED)
-                       goto fscorrupt_out;
-
-               ASSERT(vn_count(VFS_I(rsumip)) == 1);
-       }
-
-       /*
-        * Synchronously flush root inode to disk
-        */
-       error = xfs_iflush(rip, XFS_IFLUSH_SYNC);
-       if (error == EFSCORRUPTED)
-               goto fscorrupt_out2;
-
-       if (vn_count(VFS_I(rip)) != 1 && !relocation) {
-               xfs_iunlock(rip, XFS_ILOCK_EXCL);
-               return XFS_ERROR(EBUSY);
-       }
-
        /*
         * Release dquot that rootinode, rbmino and rsumino might be holding,
         * flush and purge the quota inodes.
         */
-       error = XFS_QM_UNMOUNT(mp);
-       if (error == EFSCORRUPTED)
-               goto fscorrupt_out2;
+       XFS_QM_UNMOUNT(mp);
 
-       if (rbmip) {
-               IRELE(rbmip);
-               IRELE(rsumip);
-       }
+       if (mp->m_rbmip)
+               IRELE(mp->m_rbmip);
+       if (mp->m_rsumip)
+               IRELE(mp->m_rsumip);
 
-       xfs_iunlock(rip, XFS_ILOCK_EXCL);
        return 0;
-
-fscorrupt_out:
-       xfs_ifunlock(rip);
-
-fscorrupt_out2:
-       xfs_iunlock(rip, XFS_ILOCK_EXCL);
-
-       return XFS_ERROR(EFSCORRUPTED);
 }
-