Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[mv-sheeva.git] / fs / xfs / xfs_vfsops.c

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index c2a6eab7fa2dee64316972ce4424106ef0b953dd..65c561201cb879da8a83d1df3c40fe2af7927d96 100644 (file)
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -696,7 +696,7 @@ xfs_unmount_flush(
        bhv_vnode_t     *rvp = XFS_ITOV(rip);
        int             error;
 
-       xfs_ilock(rip, XFS_ILOCK_EXCL);
+       xfs_ilock(rip, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT);
        xfs_iflock(rip);
 
        /*
@@ -872,10 +872,10 @@ xfs_statvfs(
  *                    this by simply making sure the log gets flushed
  *                    if SYNC_BDFLUSH is set, and by actually writing it
  *                    out otherwise.
- *     SYNC_DIO_WAIT - The caller wants us to wait for all direct I/Os
- *                    as well to ensure all data I/O completes before we
- *                    return. Forms the drain side of the write barrier needed
- *                    to safely quiesce the filesystem.
+ *     SYNC_IOWAIT  - The caller wants us to wait for all data I/O to complete
+ *                    before we return (including direct I/O). Forms the drain
+ *                    side of the write barrier needed to safely quiesce the
+ *                    filesystem.
  *
  */
 /*ARGSUSED*/
@@ -1147,7 +1147,7 @@ xfs_sync_inodes(
                        if (XFS_FORCED_SHUTDOWN(mp)) {
                                bhv_vop_toss_pages(vp, 0, -1, FI_REMAPF);
                        } else {
-                               bhv_vop_flushinval_pages(vp, 0, -1, FI_REMAPF);
+                               error = bhv_vop_flushinval_pages(vp, 0, -1, FI_REMAPF);
                        }
 
                        xfs_ilock(ip, XFS_ILOCK_SHARED);
@@ -1174,10 +1174,11 @@ xfs_sync_inodes(
 
                }
                /*
-                * When freezing, we need to wait ensure direct I/O is complete
-                * as well to ensure all data modification is complete here
+                * When freezing, we need to wait ensure all I/O (including direct
+                * I/O) is complete to ensure no further data modification can take
+                * place after this point
                 */
-               if (flags & SYNC_DIO_WAIT)
+               if (flags & SYNC_IOWAIT)
                        vn_iowait(vp);
 
                if (flags & SYNC_BDFLUSH) {
@@ -1538,7 +1539,7 @@ xfs_syncsub(
                xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
                xfs_trans_ihold(tp, ip);
                xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
-               error = xfs_trans_commit(tp, 0, NULL);
+               error = xfs_trans_commit(tp, 0);
                xfs_iunlock(ip, XFS_ILOCK_EXCL);
                xfs_log_force(mp, (xfs_lsn_t)0, log_flags);
        }
@@ -1975,7 +1976,7 @@ xfs_freeze(
        /* flush inodes and push all remaining buffers out to disk */
        xfs_quiesce_fs(mp);
 
-       BUG_ON(atomic_read(&mp->m_active_trans) > 0);
+       ASSERT_ALWAYS(atomic_read(&mp->m_active_trans) == 0);
 
        /* Push the superblock and write an unmount record */
        xfs_log_unmount_write(mp);