xfs: unlock the inode before log force in xfs_fs_nfs_commit_metadata
authorChristoph Hellwig <hch@infradead.org>
Sun, 18 Sep 2011 20:47:50 +0000 (20:47 +0000)
committerAlex Elder <aelder@sgi.com>
Wed, 12 Oct 2011 02:15:08 +0000 (21:15 -0500)
Only read the LSN we need to push to with the ilock held, and then release
it before we do the log force to improve concurrency.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
fs/xfs/xfs_export.c

index 75e5d322e48fcd6a6bb2b604b049aac3c07cfd37..da108977b21f8582c7af92e2d4edcdbca8ba07b7 100644 (file)
@@ -229,16 +229,16 @@ xfs_fs_nfs_commit_metadata(
 {
        struct xfs_inode        *ip = XFS_I(inode);
        struct xfs_mount        *mp = ip->i_mount;
-       int                     error = 0;
+       xfs_lsn_t               lsn = 0;
 
        xfs_ilock(ip, XFS_ILOCK_SHARED);
-       if (xfs_ipincount(ip)) {
-               error = _xfs_log_force_lsn(mp, ip->i_itemp->ili_last_lsn,
-                               XFS_LOG_SYNC, NULL);
-       }
+       if (xfs_ipincount(ip))
+               lsn = ip->i_itemp->ili_last_lsn;
        xfs_iunlock(ip, XFS_ILOCK_SHARED);
 
-       return error;
+       if (!lsn)
+               return 0;
+       return _xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL);
 }
 
 const struct export_operations xfs_export_operations = {