Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[~shefty/rdma-dev.git] / fs / reiserfs / inode.c
index 4dcb88046030f2c756c1e9c31496ce91784e389d..41656d40dc5c87fc8bcfd9ec5aea4bc635ebc092 100644 (file)
@@ -2437,7 +2437,7 @@ static int reiserfs_write_full_page(struct page *page,
                /* from this point on, we know the buffer is mapped to a
                 * real block and not a direct item
                 */
-               if (wbc->sync_mode != WB_SYNC_NONE || !wbc->nonblocking) {
+               if (wbc->sync_mode != WB_SYNC_NONE) {
                        lock_buffer(bh);
                } else {
                        if (!trylock_buffer(bh)) {