From 8221c923b9a5c932691ab24511ffc4675f567914 Mon Sep 17 00:00:00 2001 From: Yongqiang Yang Date: Mon, 31 Oct 2011 17:54:36 -0400 Subject: [PATCH] --- yaml --- r: 273178 b: refs/heads/master c: e260daf27902b2189a9198f5b64fa4567939bb5b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index db996fecf581..a21253dfbcb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0edeb71dc9133bfb505d3bf59642e07cd936613e +refs/heads/master: e260daf27902b2189a9198f5b64fa4567939bb5b diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 60af5126eb05..f60b459b27d7 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -3179,7 +3179,6 @@ int ext4_discard_partial_page_buffers_no_lock(handle_t *handle, ext4_fsblk_t index = from >> PAGE_CACHE_SHIFT; unsigned int offset = from & (PAGE_CACHE_SIZE-1); unsigned int blocksize, max, pos; - unsigned int end_of_block, range_to_discard; ext4_lblk_t iblock; struct buffer_head *bh; int err = 0; @@ -3231,6 +3230,8 @@ int ext4_discard_partial_page_buffers_no_lock(handle_t *handle, pos = offset; while (pos < offset + length) { + unsigned int end_of_block, range_to_discard; + err = 0; /* The length of space left to zero and unmap */