Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6: (52 commits) UBIFS: switch to dynamic printks UBIFS: fix kernel-doc comments UBIFS: fix extremely rare mount failure UBIFS: simplify LEB recovery function further UBIFS: always cleanup the recovered LEB UBIFS: clean up LEB recovery function UBIFS: fix-up free space on mount if flag is set UBIFS: add the fixup function UBIFS: add a superblock flag for free space fix-up UBIFS: share the next_log_lnum helper UBIFS: expect corruption only in last journal head LEBs UBIFS: synchronize write-buffer before switching to the next bud UBIFS: remove BUG statement UBIFS: change bud replay function conventions UBIFS: substitute the replay tree with a replay list UBIFS: simplify replay UBIFS: store free and dirty space in the bud replay entry UBIFS: remove unnecessary stack variable UBIFS: double check that buds are replied in order UBIFS: make 2 functions static ...
Showing
- Documentation/filesystems/ubifs.txt 2 additions, 24 deletionsDocumentation/filesystems/ubifs.txt
- fs/ubifs/budget.c 52 additions, 52 deletionsfs/ubifs/budget.c
- fs/ubifs/commit.c 1 addition, 1 deletionfs/ubifs/commit.c
- fs/ubifs/debug.c 108 additions, 59 deletionsfs/ubifs/debug.c
- fs/ubifs/debug.h 64 additions, 114 deletionsfs/ubifs/debug.h
- fs/ubifs/dir.c 2 additions, 2 deletionsfs/ubifs/dir.c
- fs/ubifs/file.c 16 additions, 12 deletionsfs/ubifs/file.c
- fs/ubifs/find.c 5 additions, 5 deletionsfs/ubifs/find.c
- fs/ubifs/gc.c 38 additions, 33 deletionsfs/ubifs/gc.c
- fs/ubifs/io.c 13 additions, 20 deletionsfs/ubifs/io.c
- fs/ubifs/journal.c 16 additions, 13 deletionsfs/ubifs/journal.c
- fs/ubifs/log.c 7 additions, 21 deletionsfs/ubifs/log.c
- fs/ubifs/lprops.c 45 additions, 70 deletionsfs/ubifs/lprops.c
- fs/ubifs/lpt_commit.c 54 additions, 1 deletionfs/ubifs/lpt_commit.c
- fs/ubifs/master.c 4 additions, 4 deletionsfs/ubifs/master.c
- fs/ubifs/misc.h 17 additions, 0 deletionsfs/ubifs/misc.h
- fs/ubifs/orphan.c 2 additions, 1 deletionfs/ubifs/orphan.c
- fs/ubifs/recovery.c 178 additions, 176 deletionsfs/ubifs/recovery.c
- fs/ubifs/replay.c 232 additions, 236 deletionsfs/ubifs/replay.c
- fs/ubifs/sb.c 152 additions, 1 deletionfs/ubifs/sb.c
Loading
Please register or sign in to comment