nilfs2: extend nilfs_sustat ioctl struct

[linux-2.6-omap-h63xx.git] / fs / nilfs2 / the_nilfs.h

diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h
index 9cd3c113f05277e03f55eb1c7fa4ba9592c90bbc..af566e78f7af132cc09061496c06cca49cc8ba76 100644 (file)
--- a/fs/nilfs2/the_nilfs.h
+++ b/fs/nilfs2/the_nilfs.h
@@ -37,7 +37,6 @@ enum {
        THE_NILFS_LOADED,       /* Roll-back/roll-forward has done and
                                   the latest checkpoint was loaded */
        THE_NILFS_DISCONTINUED, /* 'next' pointer chain has broken */
-       THE_NILFS_COND_NONGC_WRITE,     /* Condition to wake up cleanerd */
 };
 
 /**
@@ -52,7 +51,6 @@ enum {
  * @ns_writer_refcount: number of referrers on ns_writer
  * @ns_sbh: buffer head of the on-disk super block
  * @ns_sbp: pointer to the super block data
- * @ns_used_segments: list of full segments in volatile active state
  * @ns_supers: list of nilfs super block structs
  * @ns_seg_seq: segment sequence counter
  * @ns_segnum: index number of the latest full segment.
@@ -66,6 +64,7 @@ enum {
  * @ns_last_pseg: start block number of the latest segment
  * @ns_last_seq: sequence value of the latest segment
  * @ns_last_cno: checkpoint number of the latest segment
+ * @ns_prot_seq: least sequence number of segments which must not be reclaimed
  * @ns_free_segments_count: counter of free segments
  * @ns_segctor_sem: segment constructor semaphore
  * @ns_dat: DAT file inode
@@ -74,7 +73,6 @@ enum {
  * @ns_gc_dat: shadow inode of the DAT file inode for GC
  * @ns_gc_inodes: dummy inodes to keep live blocks
  * @ns_gc_inodes_h: hash list to keep dummy inode holding live blocks
- * @ns_cleanerd_wq: wait queue for cleanerd
  * @ns_blocksize_bits: bit length of block size
  * @ns_nsegments: number of segments in filesystem
  * @ns_blocks_per_segment: number of blocks per segment
@@ -105,7 +103,6 @@ struct the_nilfs {
         */
        struct buffer_head     *ns_sbh;
        struct nilfs_super_block *ns_sbp;
-       struct list_head        ns_used_segments;
        unsigned                ns_mount_state;
        struct list_head        ns_supers;
 
@@ -134,6 +131,7 @@ struct the_nilfs {
        sector_t                ns_last_pseg;
        u64                     ns_last_seq;
        __u64                   ns_last_cno;
+       u64                     ns_prot_seq;
        unsigned long           ns_free_segments_count;
 
        struct rw_semaphore     ns_segctor_sem;
@@ -151,9 +149,6 @@ struct the_nilfs {
        struct list_head        ns_gc_inodes;
        struct hlist_head      *ns_gc_inodes_h;
 
-       /* cleanerd */
-       wait_queue_head_t       ns_cleanerd_wq;
-
        /* Disk layout information (static) */
        unsigned int            ns_blocksize_bits;
        unsigned long           ns_nsegments;
@@ -186,7 +181,6 @@ static inline int nilfs_##name(struct the_nilfs *nilfs)                     \
 THE_NILFS_FNS(INIT, init)
 THE_NILFS_FNS(LOADED, loaded)
 THE_NILFS_FNS(DISCONTINUED, discontinued)
-THE_NILFS_FNS(COND_NONGC_WRITE, cond_nongc_write)
 
 void nilfs_set_last_segment(struct the_nilfs *, sector_t, u64, __u64);
 struct the_nilfs *alloc_nilfs(struct block_device *);
@@ -194,7 +188,6 @@ void put_nilfs(struct the_nilfs *);
 int init_nilfs(struct the_nilfs *, struct nilfs_sb_info *, char *);
 int load_nilfs(struct the_nilfs *, struct nilfs_sb_info *);
 int nilfs_count_free_blocks(struct the_nilfs *, sector_t *);
-void nilfs_dispose_used_segments(struct the_nilfs *);
 int nilfs_checkpoint_is_mounted(struct the_nilfs *, __u64, int);
 int nilfs_near_disk_full(struct the_nilfs *);