summaryrefslogtreecommitdiff
path: root/fs/xfs/linux-2.6/xfs_aops.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-06-21 15:15:47 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2011-06-21 15:15:47 +1000
commit0ea2a56be8334bdaf42ba76c7cbbf37b99db5f4f (patch)
tree6b8afa0a92121bb9fefb00e8f501be8dcb4961ea /fs/xfs/linux-2.6/xfs_aops.c
parentfb5342857b869094248baa7f2978460221348966 (diff)
parente84d0a4f8e39a73003a6ec9a11b07702745f4c1f (diff)
Merge remote-tracking branch 'writeback/next'
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_aops.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_aops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 79ce38be15a1..7559861481aa 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -970,7 +970,7 @@ xfs_vm_writepage(
offset = page_offset(page);
type = IO_OVERWRITE;
- if (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking)
+ if (wbc->sync_mode == WB_SYNC_NONE)
nonblocking = 1;
do {