Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[net-next-2.6.git] / fs / nilfs2 / sb.h

diff --git a/fs/nilfs2/sb.h b/fs/nilfs2/sb.h
index 0776ccc2504a9eadee52c41ac58689340492a5a6..35a07157b980bc69823904f0c387d538ded45701 100644 (file)
--- a/fs/nilfs2/sb.h
+++ b/fs/nilfs2/sb.h
@@ -42,11 +42,6 @@ struct nilfs_sc_info;
  * NILFS super-block data in memory
  */
 struct nilfs_sb_info {
-       /* Snapshot status */
-       __u64 s_snapshot_cno;           /* Checkpoint number */
-       atomic_t s_inodes_count;
-       atomic_t s_blocks_count;        /* Reserved (might be deleted) */
-
        /* Mount options */
        unsigned long s_mount_opt;
        uid_t s_resuid;
@@ -59,8 +54,6 @@ struct nilfs_sb_info {
        /* Fundamental members */
        struct super_block *s_super;    /* reverse pointer to super_block */
        struct the_nilfs *s_nilfs;
-       struct list_head s_list;        /* list head for nilfs->ns_supers */
-       atomic_t s_count;               /* reference count */
 
        /* Segment constructor */
        struct list_head s_dirty_files; /* dirty files list */
@@ -68,9 +61,6 @@ struct nilfs_sb_info {
        spinlock_t s_inode_lock;        /* Lock for the nilfs inode.
                                           It covers s_dirty_files list */
 
-       /* Metadata files */
-       struct inode *s_ifile;          /* index file inode */
-
        /* Inode allocator */
        spinlock_t s_next_gen_lock;
        u32 s_next_generation;