2 files changed, 6 insertions, 7 deletions

diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
index 32abd96b1095..b619d6b8ca43 100644
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
@@ -353,7 +353,7 @@ xfs_sync_fsdata(
          * If this is xfssyncd() then only sync the superblock if we can
          * lock it without sleeping and it is not pinned.
          */
-        if (flags & SYNC_BDFLUSH) {
+        if (flags & SYNC_TRYLOCK) {
                 ASSERT(!(flags & SYNC_WAIT));
 
                 bp = xfs_getsb(mp, XFS_BUF_TRYLOCK);
@@ -418,7 +418,7 @@ xfs_quiesce_data(
 
         /* push non-blocking */
         xfs_sync_data(mp, 0);
-        xfs_qm_sync(mp, SYNC_BDFLUSH);
+        xfs_qm_sync(mp, SYNC_TRYLOCK);
         xfs_filestream_flush(mp);
 
         /* push and block */
@@ -568,8 +568,8 @@ xfs_sync_worker(
                 xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE);
                 xfs_reclaim_inodes(mp, XFS_IFLUSH_DELWRI_ELSE_ASYNC);
                 /* dgc: errors ignored here */
-                error = xfs_qm_sync(mp, SYNC_BDFLUSH);
-                error = xfs_sync_fsdata(mp, SYNC_BDFLUSH);
+                error = xfs_qm_sync(mp, SYNC_TRYLOCK);
+                error = xfs_sync_fsdata(mp, SYNC_TRYLOCK);
                 if (xfs_log_need_covered(mp))
                         error = xfs_commit_dummy_trans(mp, XFS_LOG_FORCE);
         }
diff --git a/fs/xfs/linux-2.6/xfs_sync.h b/fs/xfs/linux-2.6/xfs_sync.h
index bda33a03e12b..2a10301c99c7 100644
--- a/fs/xfs/linux-2.6/xfs_sync.h
+++ b/fs/xfs/linux-2.6/xfs_sync.h
@@ -29,9 +29,8 @@ typedef struct xfs_sync_work {
         struct completion       *w_completion;
 } xfs_sync_work_t;
 
-#define SYNC_WAIT               0x0004  /* wait for i/o to complete */
-#define SYNC_BDFLUSH            0x0008  /* BDFLUSH is calling -- don't block */
-#define SYNC_TRYLOCK            0x0020  /* only try to lock inodes */
+#define SYNC_WAIT               0x0001  /* wait for i/o to complete */
+#define SYNC_TRYLOCK            0x0002  /* only try to lock inodes */
 
 int xfs_syncd_init(struct xfs_mount *mp);
 void xfs_syncd_stop(struct xfs_mount *mp);