xfs: remove invalid barrier optimization from xfs_fsync

commit e8b217e7530c6a073ac69f1c85b922d93fdf5647 upstream

Date: Tue, 2 Feb 2010 10:16:26 +1100
We always need to flush the disk write cache and can't skip it just because
the no inode attributes have changed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index ae2e44fafd7258eb73e11231c7eb73ec112bc3f9..38a63244e75dda8d89fb1e17b0009ce1c491998b 100644 (file)
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -597,7 +597,7 @@ xfs_fsync(
 {
        xfs_trans_t     *tp;
        int             error = 0;
-       int             log_flushed = 0, changed = 1;
+       int             log_flushed = 0;
 
        xfs_itrace_entry(ip);
 
@@ -627,19 +627,11 @@ xfs_fsync(
                 * disk yet, the inode will be still be pinned.  If it is,
                 * force the log.
                 */
-
                xfs_iunlock(ip, XFS_ILOCK_SHARED);
-
                if (xfs_ipincount(ip)) {
                        error = _xfs_log_force(ip->i_mount, (xfs_lsn_t)0,
                                      XFS_LOG_FORCE | XFS_LOG_SYNC,
                                      &log_flushed);
-               } else {
-                       /*
-                        * If the inode is not pinned and nothing has changed
-                        * we don't need to flush the cache.
-                        */
-                       changed = 0;
                }
        } else  {
                /*
@@ -674,7 +666,7 @@ xfs_fsync(
                xfs_iunlock(ip, XFS_ILOCK_EXCL);
        }
 
-       if ((ip->i_mount->m_flags & XFS_MOUNT_BARRIER) && changed) {
+       if (ip->i_mount->m_flags & XFS_MOUNT_BARRIER) {
                /*
                 * If the log write didn't issue an ordered tag we need
                 * to flush the disk cache for the data device now.