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

[pandora-kernel.git] / fs / xfs / xfs_log.c

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 925d572..ba8e36e 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -916,19 +916,6 @@ xlog_iodone(xfs_buf_t *bp)
        aborted = 0;
        l = iclog->ic_log;
 
-       /*
-        * If the _XFS_BARRIER_FAILED flag was set by a lower
-        * layer, it means the underlying device no longer supports
-        * barrier I/O. Warn loudly and turn off barriers.
-        */
-       if (bp->b_flags & _XFS_BARRIER_FAILED) {
-               bp->b_flags &= ~_XFS_BARRIER_FAILED;
-               l->l_mp->m_flags &= ~XFS_MOUNT_BARRIER;
-               xfs_fs_cmn_err(CE_WARN, l->l_mp,
-                               "xlog_iodone: Barriers are no longer supported"
-                               " by device. Disabling barriers\n");
-       }
-
        /*
         * Race to shutdown the filesystem if we see an error.
         */
@@ -3015,7 +3002,8 @@ _xfs_log_force(
 
        XFS_STATS_INC(xs_log_force);
 
-       xlog_cil_push(log, 1);
+       if (log->l_cilp)
+               xlog_cil_force(log);
 
        spin_lock(&log->l_icloglock);
 
@@ -3167,7 +3155,7 @@ _xfs_log_force_lsn(
        XFS_STATS_INC(xs_log_force);
 
        if (log->l_cilp) {
-               lsn = xlog_cil_push_lsn(log, lsn);
+               lsn = xlog_cil_force_lsn(log, lsn);
                if (lsn == NULLCOMMITLSN)
                        return 0;
        }
@@ -3724,7 +3712,7 @@ xfs_log_force_umount(
         * call below.
         */
        if (!logerror && (mp->m_flags & XFS_MOUNT_DELAYLOG))
-               xlog_cil_push(log, 1);
+               xlog_cil_force(log);
 
        /*
         * We must hold both the GRANT lock and the LOG lock,