Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: add uid, gid, and umask mount options JFS: Take logsync lock before testing mp->lsn JFS: kzalloc conversion JFS: Add missing file from fa3241d2 JFS: Use the kthread_ API JFS: Fix regression. fsck complains if symlinks do not have INLINEEA attribute JFS: ext2 inode attributes for jfs JFS: semaphore to mutex conversion. JFS: make buddy table static JFS: Add back directory i_size calculations for legacy partitions
Showing
- fs/jfs/Makefile 2 additions, 1 deletionfs/jfs/Makefile
- fs/jfs/acl.c 5 additions, 2 deletionsfs/jfs/acl.c
- fs/jfs/file.c 1 addition, 0 deletionsfs/jfs/file.c
- fs/jfs/inode.c 8 additions, 7 deletionsfs/jfs/inode.c
- fs/jfs/ioctl.c 107 additions, 0 deletionsfs/jfs/ioctl.c
- fs/jfs/jfs_dinode.h 27 additions, 4 deletionsfs/jfs/jfs_dinode.h
- fs/jfs/jfs_dmap.c 4 additions, 4 deletionsfs/jfs/jfs_dmap.c
- fs/jfs/jfs_dmap.h 1 addition, 1 deletionfs/jfs/jfs_dmap.h
- fs/jfs/jfs_dtree.c 12 additions, 1 deletionfs/jfs/jfs_dtree.c
- fs/jfs/jfs_extent.c 10 additions, 10 deletionsfs/jfs/jfs_extent.c
- fs/jfs/jfs_imap.c 55 additions, 17 deletionsfs/jfs/jfs_imap.c
- fs/jfs/jfs_imap.h 2 additions, 2 deletionsfs/jfs/jfs_imap.h
- fs/jfs/jfs_incore.h 8 additions, 2 deletionsfs/jfs/jfs_incore.h
- fs/jfs/jfs_inode.c 42 additions, 4 deletionsfs/jfs/jfs_inode.c
- fs/jfs/jfs_inode.h 3 additions, 0 deletionsfs/jfs/jfs_inode.h
- fs/jfs/jfs_lock.h 1 addition, 0 deletionsfs/jfs/jfs_lock.h
- fs/jfs/jfs_logmgr.c 12 additions, 23 deletionsfs/jfs/jfs_logmgr.c
- fs/jfs/jfs_logmgr.h 1 addition, 1 deletionfs/jfs/jfs_logmgr.h
- fs/jfs/jfs_metapage.c 1 addition, 2 deletionsfs/jfs/jfs_metapage.c
- fs/jfs/jfs_superblock.h 3 additions, 6 deletionsfs/jfs/jfs_superblock.h
Loading
Please register or sign in to comment