---

yaml --- r: 274667 b: refs/heads/master c: f0dd959 h: refs/heads/master i: 274665: 667b75f 274663: 655664f v: v3
git-mirror · Oct 20, 2011 · 5e1f003 · 5e1f003
1 parent 45dac70
commit 5e1f003
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;
 	}