From: Yongqiang Yang Date: Mon, 31 Oct 2011 21:54:36 +0000 (-0400) Subject: ext4: move vars to local scope in ext4_discard_partial_page_buffers_no_lock() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e260daf27902b2189a9198f5b64fa4567939bb5b;p=deliverable%2Flinux.git ext4: move vars to local scope in ext4_discard_partial_page_buffers_no_lock() Signed-off-by: Yongqiang Yang Signed-off-by: "Theodore Ts'o" --- diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 60af5126eb05..f60b459b27d7 100644 --- a/fs/ext4/inode.c +++ b/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 */