From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Mar 2011 05:33:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... 
X-Git-Tag: v2.6.39-rc1~411
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=5bab188a316718a26346cdb25c4cc6b319f8f907;hp=-c

Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2

* '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
---

5bab188a316718a26346cdb25c4cc6b319f8f907
diff --combined include/linux/magic.h
index 6cfe344f9559,248930efdd31..1e5df2af8d84
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@@ -23,11 -23,11 +23,12 @@@
  #define XENFS_SUPER_MAGIC	0xabba1974
  #define EXT4_SUPER_MAGIC	0xEF53
  #define BTRFS_SUPER_MAGIC	0x9123683E
+ #define NILFS_SUPER_MAGIC	0x3434
  #define HPFS_SUPER_MAGIC	0xf995e849
  #define ISOFS_SUPER_MAGIC	0x9660
  #define JFFS2_SUPER_MAGIC	0x72b6
  #define ANON_INODE_FS_MAGIC	0x09041934
 +#define PSTOREFS_MAGIC		0x6165676C
  
  #define MINIX_SUPER_MAGIC	0x137F		/* original minix fs */
  #define MINIX_SUPER_MAGIC2	0x138F		/* minix fs, 30 char names */