tree 77f446c0ac5d58eeb725975a1b579eda22f1f2e5
parent eca281aad0c293e7698edea5834c252dd8108afa
parent 0d561f12b490dd2b993d73112d3297007688e6df
author Linus Torvalds <torvalds@linux-foundation.org> 1267635229 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1267635229 -0800

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