Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · 5bab188a
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: move NILFS_SUPER_MAGIC to linux/magic.h
      nilfs2: get rid of nilfs_sb_info structure
      nilfs2: use sb instance instead of nilfs_sb_info struct
      nilfs2: get rid of sc_sbi back pointer
      nilfs2: move log writer onto nilfs object
      nilfs2: move next generation counter into nilfs object
      nilfs2: move s_inode_lock and s_dirty_files into nilfs object
      nilfs2: move parameters on nilfs_sb_info into nilfs object
      nilfs2: move mount options to nilfs object
      nilfs2: record used amount of each checkpoint in checkpoint list
      nilfs2: optimize rec_len functions
      nilfs2: append blocksize info to warnings during loading super blocks
      nilfs2: add compat ioctl
      nilfs2: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION
      nilfs2: tighten restrictions on inode flags
      nilfs2: mark S_NOATIME on inodes only if NOATIME attribute is set
      nilfs2: use common file attribute macros
      nilfs2: add free entries count only if clear bit operation succeeded
      nilfs2: decrement inodes count only if raw inode was successfully deleted
    5bab188a