Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* '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
Showing
- fs/nilfs2/bmap.c 5 additions, 0 deletionsfs/nilfs2/bmap.c
- fs/nilfs2/nilfs.h 0 additions, 5 deletionsfs/nilfs2/nilfs.h
- fs/nilfs2/recovery.c 4 additions, 16 deletionsfs/nilfs2/recovery.c
- fs/nilfs2/sufile.c 104 additions, 186 deletionsfs/nilfs2/sufile.c
- fs/nilfs2/sufile.h 75 additions, 4 deletionsfs/nilfs2/sufile.h
- fs/nilfs2/super.c 5 additions, 2 deletionsfs/nilfs2/super.c
- fs/nilfs2/the_nilfs.c 4 additions, 0 deletionsfs/nilfs2/the_nilfs.c
Please register or sign in to comment