Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix possible mismatch of sufile counters on recovery
  nilfs2: segment usage file cleanups
  nilfs2: fix wrong accounting and duplicate brelse in nilfs_sufile_set_error
  nilfs2: simplify handling of active state of segments fix
  nilfs2: remove module version
  nilfs2: fix lockdep recursive locking warning on meta data files
  nilfs2: fix lockdep recursive locking warning on bmap
  nilfs2: return f_fsid for statfs2

...

This commit is contained in:

Linus Torvalds 2009-04-14 10:10:53 -07:00

parent 2b6b6d385d c85399c2da

commit 9fc0178caa

7 changed files with 197 additions and 213 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

fs/nilfs2/bmap.c

View file

5

fs/nilfs2/nilfs.h

View file

20

fs/nilfs2/recovery.c

View file

292

fs/nilfs2/sufile.c

View file

79

fs/nilfs2/sufile.h

View file

7

fs/nilfs2/super.c

View file

4

fs/nilfs2/the_nilfs.c

View file