From 73f252321dc83bec51e377254d3cbd23cdf2db47 Mon Sep 17 00:00:00 2001 From: Yongqiang Yang Date: Mon, 31 Oct 2011 17:56:10 -0400 Subject: [PATCH] --- yaml --- r: 273179 b: refs/heads/master c: 5129d05fda57be13f434dbe8536de39a6c25496d h: refs/heads/master i: 273177: e7a8ea40e75ac193d1696b00faa944f20a9ca288 273175: 549159a09eaef8ea6dc5fa4374739e6af5b99cff v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a21253dfbcb4..8619f3b8e18e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e260daf27902b2189a9198f5b64fa4567939bb5b +refs/heads/master: 5129d05fda57be13f434dbe8536de39a6c25496d diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index f60b459b27d7..5fcef98f98e5 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -3129,7 +3129,7 @@ int ext4_discard_partial_page_buffers(handle_t *handle, page = find_or_create_page(mapping, from >> PAGE_CACHE_SHIFT, mapping_gfp_mask(mapping) & ~__GFP_FS); if (!page) - return -EINVAL; + return -ENOMEM; err = ext4_discard_partial_page_buffers_no_lock(handle, inode, page, from, length, flags); @@ -3372,7 +3372,7 @@ int ext4_block_zero_page_range(handle_t *handle, page = find_or_create_page(mapping, from >> PAGE_CACHE_SHIFT, mapping_gfp_mask(mapping) & ~__GFP_FS); if (!page) - return -EINVAL; + return -ENOMEM; blocksize = inode->i_sb->s_blocksize; max = blocksize - (offset & (blocksize - 1));