From c755c0a01e90ff49dae35b89cefd2d243a31cb08 Mon Sep 17 00:00:00 2001 From: Miao Xie Date: Wed, 5 Dec 2012 10:56:13 +0000 Subject: [PATCH] --- yaml --- r: 346732 b: refs/heads/master c: ac6a2b36f9fcfbe4865550afb6d333dec6b57578 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 797fbb0a9664..0b5b4a43e74b 100644 --- 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 index bf609581c5d0..0446cbe8bcaf 100644 --- 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;