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

[pandora-kernel.git] / fs / nfs / write.c

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 0857931..00e3750 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1566,8 +1566,7 @@ int nfs_write_inode(struct inode *inode, struct writeback_control *wbc)
                int status;
                bool sync = true;
 
-               if (wbc->sync_mode == WB_SYNC_NONE || wbc->nonblocking ||
-                   wbc->for_background)
+               if (wbc->sync_mode == WB_SYNC_NONE)
                        sync = false;
 
                status = pnfs_layoutcommit_inode(inode, sync);