diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:19:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:19:03 -0400 |
commit | 396b122f6af3d329df3b4d688f6e66de3e2a399a (patch) | |
tree | 0b4185d529c1ba4c8eca1de23f14beecbe460323 /fs/ubifs/find.c | |
parent | ed402af3c23a4804b3f8899263e8d0f97c62ab49 (diff) | |
parent | 54779aabb0183bbe049d2b52e96cd148366dfb0b (diff) |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits)
UBIFS: fix ubifs_compress commentary
UBIFS: amend printk
UBIFS: do not read unnecessary bytes when unpacking bits
UBIFS: check buffer length when scanning for LPT nodes
UBIFS: correct condition to eliminate unecessary assignment
UBIFS: add more debugging messages for LPT
UBIFS: fix bulk-read handling uptodate pages
UBIFS: improve garbage collection
UBIFS: allow for sync_fs when read-only
UBIFS: commit on sync_fs
UBIFS: correct comment for commit_on_unmount
UBIFS: update dbg_dump_inode
UBIFS: fix commentary
UBIFS: fix races in bit-fields
UBIFS: ensure data read beyond i_size is zeroed out correctly
UBIFS: correct key comparison
UBIFS: use bit-fields when possible
UBIFS: check data CRC when in error state
UBIFS: improve znode splitting rules
UBIFS: add no_chk_data_crc mount option
...
Diffstat (limited to 'fs/ubifs/find.c')
-rw-r--r-- | fs/ubifs/find.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c index 47814cde2407..717d79c97c5e 100644 --- a/fs/ubifs/find.c +++ b/fs/ubifs/find.c | |||
@@ -901,11 +901,11 @@ static int get_idx_gc_leb(struct ubifs_info *c) | |||
901 | * it is needed now for this commit. | 901 | * it is needed now for this commit. |
902 | */ | 902 | */ |
903 | lp = ubifs_lpt_lookup_dirty(c, lnum); | 903 | lp = ubifs_lpt_lookup_dirty(c, lnum); |
904 | if (unlikely(IS_ERR(lp))) | 904 | if (IS_ERR(lp)) |
905 | return PTR_ERR(lp); | 905 | return PTR_ERR(lp); |
906 | lp = ubifs_change_lp(c, lp, LPROPS_NC, LPROPS_NC, | 906 | lp = ubifs_change_lp(c, lp, LPROPS_NC, LPROPS_NC, |
907 | lp->flags | LPROPS_INDEX, -1); | 907 | lp->flags | LPROPS_INDEX, -1); |
908 | if (unlikely(IS_ERR(lp))) | 908 | if (IS_ERR(lp)) |
909 | return PTR_ERR(lp); | 909 | return PTR_ERR(lp); |
910 | dbg_find("LEB %d, dirty %d and free %d flags %#x", | 910 | dbg_find("LEB %d, dirty %d and free %d flags %#x", |
911 | lp->lnum, lp->dirty, lp->free, lp->flags); | 911 | lp->lnum, lp->dirty, lp->free, lp->flags); |