diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /fs/reiserfs/prints.c | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'fs/reiserfs/prints.c')
-rw-r--r-- | fs/reiserfs/prints.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c index adbc6f538515..45de98b59466 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 | |||
586 | va_list args; | 586 | va_list args; |
587 | int mode, first, last; | 587 | int mode, first, last; |
588 | 588 | ||
589 | va_start(args, bh); | ||
590 | |||
591 | if (!bh) { | 589 | if (!bh) { |
592 | printk("print_block: buffer is NULL\n"); | 590 | printk("print_block: buffer is NULL\n"); |
593 | return; | 591 | return; |
594 | } | 592 | } |
595 | 593 | ||
594 | va_start(args, bh); | ||
595 | |||
596 | mode = va_arg(args, int); | 596 | mode = va_arg(args, int); |
597 | first = va_arg(args, int); | 597 | first = va_arg(args, int); |
598 | last = va_arg(args, int); | 598 | last = va_arg(args, int); |