From db2ef51290b00f4416a86dc456a4751306192c8b Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Wed, 24 Jun 2009 09:59:38 +0300 Subject: [PATCH] --- yaml --- r: 155298 b: refs/heads/master c: 681947d2fa1a00629de33c4df3ca72c39f06a14c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ubifs/replay.c | 2 +- trunk/fs/ubifs/ubifs.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a37af7a3bd24..4575cd8fef50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44737589442bf69d811e003d9d0064b8fc1541d6 +refs/heads/master: 681947d2fa1a00629de33c4df3ca72c39f06a14c diff --git a/trunk/fs/ubifs/replay.c b/trunk/fs/ubifs/replay.c index 11cc80125a49..769be42f39d6 100644 --- a/trunk/fs/ubifs/replay.c +++ b/trunk/fs/ubifs/replay.c @@ -957,7 +957,7 @@ static int replay_log_leb(struct ubifs_info *c, int lnum, int offs, void *sbuf) return err; out_dump: - ubifs_err("log error detected while replying the log at LEB %d:%d", + ubifs_err("log error detected while replaying the log at LEB %d:%d", lnum, offs + snod->offs); dbg_dump_node(c, snod->node); ubifs_scan_destroy(sleb); diff --git a/trunk/fs/ubifs/ubifs.h b/trunk/fs/ubifs/ubifs.h index c3a707d458a1..a29349094422 100644 --- a/trunk/fs/ubifs/ubifs.h +++ b/trunk/fs/ubifs/ubifs.h @@ -655,8 +655,8 @@ typedef int (*ubifs_lpt_scan_callback)(struct ubifs_info *c, * @delta: hard and soft timeouts delta (the timer expire inteval is @softlimit * and @softlimit + @delta) * @timer: write-buffer timer - * @no_timer: non-zero if this write-buffer does not timer - * @need_sync: non-zero if its timer expired and needs sync + * @no_timer: non-zero if this write-buffer does not have a timer + * @need_sync: non-zero if the timer expired and the wbuf needs sync'ing * @next_ino: points to the next position of the following inode number * @inodes: stores the inode numbers of the nodes which are in wbuf *