nilfs2: extend nilfs_sustat ioctl struct

This adds a new argument to the nilfs_sustat structure.

The extended field allows to delete volatile active state of segments,
which was needed to protect freshly-created segments from garbage
collection but has confused code dealing with segments.  This
extension alleviates the mess and gives room for further
simplifications.

The volatile active flag is not persistent, so it's eliminable on this
occasion without affecting compatibility other than the ioctl change.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 0 insertions, 18 deletions

diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 69b625586226..661ab762d765 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -71,7 +71,6 @@ struct the_nilfs *alloc_nilfs(struct block_device *bdev)
         INIT_LIST_HEAD(&nilfs->ns_supers);
         spin_lock_init(&nilfs->ns_last_segment_lock);
         nilfs->ns_gc_inodes_h = NULL;
-        INIT_LIST_HEAD(&nilfs->ns_used_segments);
         init_rwsem(&nilfs->ns_segctor_sem);
 
         return nilfs;
@@ -95,7 +94,6 @@ void put_nilfs(struct the_nilfs *nilfs)
          */
         might_sleep();
         if (nilfs_loaded(nilfs)) {
-                nilfs_dispose_used_segments(nilfs);
                 nilfs_mdt_clear(nilfs->ns_sufile);
                 nilfs_mdt_destroy(nilfs->ns_sufile);
                 nilfs_mdt_clear(nilfs->ns_cpfile);
@@ -463,22 +461,6 @@ int nilfs_count_free_blocks(struct the_nilfs *nilfs, sector_t *nblocks)
         return err;
 }
 
-void nilfs_dispose_used_segments(struct the_nilfs *nilfs)
-{
-        struct nilfs_segment_entry *ent, *n;
-
-        /* nilfs->sem must be locked by the caller. */
-        if (!nilfs_loaded(nilfs))
-                return;
-
-        list_for_each_entry_safe(ent, n, &nilfs->ns_used_segments, list) {
-                list_del_init(&ent->list);
-                nilfs_segment_usage_clear_volatile_active(ent->raw_su);
-                nilfs_close_segment_entry(ent, nilfs->ns_sufile);
-                nilfs_free_segment_entry(ent);
-        }
-}
-
 int nilfs_near_disk_full(struct the_nilfs *nilfs)
 {
         struct inode *sufile = nilfs->ns_sufile;