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: (23 commits) nilfs2: disallow remount of snapshot from/to a regular mount nilfs2: use huge_encode_dev/huge_decode_dev nilfs2: update comment on deactivate_super at nilfs_get_sb nilfs2: replace MS_VERBOSE with MS_SILENT nilfs2: add missing initialization of s_mode nilfs2: fix misuse of open_bdev_exclusive/close_bdev_exclusive nilfs2: enlarge s_volume_name member in nilfs_super_block nilfs2: use checkpoint number instead of timestamp to select super block nilfs2: add missing endian conversion on super block magic number nilfs2: make nilfs_sc_*_ops static nilfs2: add kernel doc comments to persistent object allocator functions nilfs2: change sc_timer from a pointer to an embedded one in struct nilfs_sc_info nilfs2: remove nilfs_segctor_init() in segment.c nilfs2: insert checkpoint number in segment summary header nilfs2: add a print message after loading nilfs2 nilfs2: cleanup multi kmem_cache_{create,destroy} code nilfs2: move out checksum routines to segment buffer code nilfs2: move pointer to super root block into logs nilfs2: change default of 'errors' mount option to 'remount-ro' mode nilfs2: Combine nilfs_btree_release_path() and nilfs_btree_free_path() ...
No related branches found
No related tags found
Showing
- Documentation/filesystems/nilfs2.txt 2 additions, 2 deletionsDocumentation/filesystems/nilfs2.txt
- fs/nilfs2/alloc.c 153 additions, 1 deletionfs/nilfs2/alloc.c
- fs/nilfs2/alloc.h 7 additions, 0 deletionsfs/nilfs2/alloc.h
- fs/nilfs2/btree.c 17 additions, 74 deletionsfs/nilfs2/btree.c
- fs/nilfs2/btree.h 20 additions, 3 deletionsfs/nilfs2/btree.h
- fs/nilfs2/inode.c 2 additions, 2 deletionsfs/nilfs2/inode.c
- fs/nilfs2/recovery.c 2 additions, 0 deletionsfs/nilfs2/recovery.c
- fs/nilfs2/segbuf.c 40 additions, 30 deletionsfs/nilfs2/segbuf.c
- fs/nilfs2/segbuf.h 7 additions, 3 deletionsfs/nilfs2/segbuf.h
- fs/nilfs2/segment.c 40 additions, 117 deletionsfs/nilfs2/segment.c
- fs/nilfs2/segment.h 3 additions, 3 deletionsfs/nilfs2/segment.h
- fs/nilfs2/super.c 114 additions, 104 deletionsfs/nilfs2/super.c
- fs/nilfs2/the_nilfs.c 7 additions, 3 deletionsfs/nilfs2/the_nilfs.c
- include/linux/nilfs2_fs.h 9 additions, 8 deletionsinclude/linux/nilfs2_fs.h
Loading
Please register or sign in to comment