diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 17:53:49 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 17:53:49 +0100 |
commit | feaf77d51a6e2e95f60c8095ac7282e610ede798 (patch) | |
tree | 77f446c0ac5d58eeb725975a1b579eda22f1f2e5 /kernel/resource.c | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | nilfs2: add reader's lock for cno in nilfs_ioctl_sync (diff) | |
download | linux-feaf77d51a6e2e95f60c8095ac7282e610ede798.tar.xz linux-feaf77d51a6e2e95f60c8095ac7282e610ede798.zip |
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: add reader's lock for cno in nilfs_ioctl_sync
nilfs2: delete unnecessary condition in load_segment_summary
nilfs2: move iterator to write log into segment buffer
nilfs2: get rid of s_dirt flag use
nilfs2: get rid of nilfs_segctor_req struct
nilfs2: delete unnecessary condition in nilfs_dat_translate
nilfs2: fix potential hang in nilfs_error on errors=remount-ro
nilfs2: use mnt_want_write in ioctls where write access is needed
nilfs2: issue discard request after cleaning segments
Diffstat (limited to 'kernel/resource.c')
0 files changed, 0 insertions, 0 deletions