Merge branch 'stable-3.2' into pandora-3.2

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

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 10ca5e5..4ec90ce 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3025,8 +3025,6 @@ maybe_sleep:
                 */
                if (iclog->ic_state & XLOG_STATE_IOERROR)
                        return XFS_ERROR(EIO);
-               if (log_flushed)
-                       *log_flushed = 1;
        } else {
 
 no_sleep:
@@ -3135,8 +3133,6 @@ try_again:
 
                                xlog_wait(&iclog->ic_prev->ic_write_wait,
                                                        &log->l_icloglock);
-                               if (log_flushed)
-                                       *log_flushed = 1;
                                already_slept = 1;
                                goto try_again;
                        }
@@ -3170,9 +3166,6 @@ try_again:
                         */
                        if (iclog->ic_state & XLOG_STATE_IOERROR)
                                return XFS_ERROR(EIO);
-
-                       if (log_flushed)
-                               *log_flushed = 1;
                } else {                /* just return */
                        spin_unlock(&log->l_icloglock);
                }