diff --git a/[refs] b/[refs]
index 7badc3c9afa5..6f62c81f8bd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 560f7d75457f86a43970aa413e334e394082dce4
+refs/heads/master: f0dd9592a1aa014b3a01aa2be7e795aae040d65b
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 81d4f68f35c9..65474d95f26f 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -5777,8 +5777,7 @@ static void btrfs_endio_direct_write(struct bio *bio, int err)
 	if (test_bit(BTRFS_ORDERED_NOCOW, &ordered->flags)) {
 		ret = btrfs_ordered_update_i_size(inode, 0, ordered);
 		if (!ret)
-			ret = btrfs_update_inode(trans, root, inode);
-		err = ret;
+			err = btrfs_update_inode(trans, root, inode);
 		goto out;
 	}