diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 18:31:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 18:31:45 +0100 |
| commit | fc1495bf99de6f65066b3234813180301ff8b693 (patch) | |
| tree | 4858db540f3c57f6f998383056ad4714b969660c /fs/ubifs/debug.c | |
| parent | V4L/DVB (13592): max2165: 32bit build patch (diff) | |
| parent | UBIFS: fix return code in check_leaf (diff) | |
| download | linux-fc1495bf99de6f65066b3234813180301ff8b693.tar.xz linux-fc1495bf99de6f65066b3234813180301ff8b693.zip | |
Merge git://git.infradead.org/ubifs-2.6
* git://git.infradead.org/ubifs-2.6:
UBIFS: fix return code in check_leaf
UBI: flush wl before clearing update marker
MAINTAINERS: change e-mail of Artem Bityutskiy
UBIFS: remove manual O_SYNC handling
UBIFS: support mounting of UBI volume character devices
UBI: Add ubi_open_volume_path
Diffstat (limited to 'fs/ubifs/debug.c')
| -rw-r--r-- | fs/ubifs/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index dbc093afd946..8a771c59ac3e 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -2014,7 +2014,7 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr, inum = key_inum_flash(c, &dent->key); fscki1 = read_add_inode(c, priv, inum); if (IS_ERR(fscki1)) { - err = PTR_ERR(fscki); + err = PTR_ERR(fscki1); ubifs_err("error %d while processing entry node and " "trying to find parent inode node %lu", err, (unsigned long)inum); |