summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2011-01-12 17:00:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 08:03:15 -0800
commit566538a6cf5bec260324dc37b6820dacd8631452 (patch)
tree5f8e0a5821626ce340ed614498a1b8945716848b /fs
parente0e3d32bb40d28cf57a6a24e1e1d87ef03b913bd (diff)
downloadlinux-3.10-566538a6cf5bec260324dc37b6820dacd8631452.tar.gz
linux-3.10-566538a6cf5bec260324dc37b6820dacd8631452.tar.bz2
linux-3.10-566538a6cf5bec260324dc37b6820dacd8631452.zip
reiserfs: make sure va_end() is always called after va_start().
A call to va_start() must always be followed by a call to va_end() in the same function. In fs/reiserfs/prints.c::print_block() this is not always the case. If 'bh' is NULL we'll return without calling va_end(). One could add a call to va_end() before the 'return' statement, but it's nicer to just move the call to va_start() after the test for 'bh' being NULL. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Acked-by: Edward Shishkin <edward.shishkin@gmail.com> Cc: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/reiserfs/prints.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index adbc6f53851..45de98b5946 100644
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -586,13 +586,13 @@ void print_block(struct buffer_head *bh, ...) //int print_mode, int first, int l
va_list args;
int mode, first, last;
- va_start(args, bh);
-
if (!bh) {
printk("print_block: buffer is NULL\n");
return;
}
+ va_start(args, bh);
+
mode = va_arg(args, int);
first = va_arg(args, int);
last = va_arg(args, int);