---

yaml --- r: 346732 b: refs/heads/master c: ac6a2b3 h: refs/heads/master v: v3
git-mirror · Dec 17, 2012 · c755c0a · c755c0a
1 parent a557920
commit c755c0a
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: 7426cc04d407621773af3a0403e57642e40c36bf
+refs/heads/master: ac6a2b36f9fcfbe4865550afb6d333dec6b57578
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
@@ -3521,11 +3521,11 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len,
 	if (ret)
 		goto out;
 
-	ret = -ENOMEM;
 again:
 	page = find_or_create_page(mapping, index, mask);
 	if (!page) {
 		btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE);
+		ret = -ENOMEM;
 		goto out;
 	}
 
@@ -3574,7 +3574,6 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len,
 		goto out_unlock;
 	}
 
-	ret = 0;
 	if (offset != PAGE_CACHE_SIZE) {
 		if (!len)
 			len = PAGE_CACHE_SIZE - offset;