aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/the_nilfs.h
diff options
context:
space:
mode:
authorRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2009-04-06 22:01:51 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:18 -0400
commit1088dcf4c3a0a27fdad5214781d5084b11405238 (patch)
tree4d08f45ff4867d629e5ad4e94e0362e897ffa1e1 /fs/nilfs2/the_nilfs.h
parent76068c4ff1cc03d9d24d17fd9e6a1475bc2f6730 (diff)
nilfs2: remove timedwait ioctl command
This removes NILFS_IOCTL_TIMEDWAIT command from ioctl interface along with the related flags and wait queue. The command is terrible because it just sleeps in the ioctl. I prefer to avoid this by devising means of event polling in userland program. By reconsidering the userland GC daemon, I found this is possible without changing behaviour of the daemon and sacrificing efficiency. 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>
Diffstat (limited to 'fs/nilfs2/the_nilfs.h')
-rw-r--r--fs/nilfs2/the_nilfs.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h
index 9cd3c113f052..75da37306964 100644
--- a/fs/nilfs2/the_nilfs.h
+++ b/fs/nilfs2/the_nilfs.h
@@ -37,7 +37,6 @@ enum {
37 THE_NILFS_LOADED, /* Roll-back/roll-forward has done and 37 THE_NILFS_LOADED, /* Roll-back/roll-forward has done and
38 the latest checkpoint was loaded */ 38 the latest checkpoint was loaded */
39 THE_NILFS_DISCONTINUED, /* 'next' pointer chain has broken */ 39 THE_NILFS_DISCONTINUED, /* 'next' pointer chain has broken */
40 THE_NILFS_COND_NONGC_WRITE, /* Condition to wake up cleanerd */
41}; 40};
42 41
43/** 42/**
@@ -74,7 +73,6 @@ enum {
74 * @ns_gc_dat: shadow inode of the DAT file inode for GC 73 * @ns_gc_dat: shadow inode of the DAT file inode for GC
75 * @ns_gc_inodes: dummy inodes to keep live blocks 74 * @ns_gc_inodes: dummy inodes to keep live blocks
76 * @ns_gc_inodes_h: hash list to keep dummy inode holding live blocks 75 * @ns_gc_inodes_h: hash list to keep dummy inode holding live blocks
77 * @ns_cleanerd_wq: wait queue for cleanerd
78 * @ns_blocksize_bits: bit length of block size 76 * @ns_blocksize_bits: bit length of block size
79 * @ns_nsegments: number of segments in filesystem 77 * @ns_nsegments: number of segments in filesystem
80 * @ns_blocks_per_segment: number of blocks per segment 78 * @ns_blocks_per_segment: number of blocks per segment
@@ -151,9 +149,6 @@ struct the_nilfs {
151 struct list_head ns_gc_inodes; 149 struct list_head ns_gc_inodes;
152 struct hlist_head *ns_gc_inodes_h; 150 struct hlist_head *ns_gc_inodes_h;
153 151
154 /* cleanerd */
155 wait_queue_head_t ns_cleanerd_wq;
156
157 /* Disk layout information (static) */ 152 /* Disk layout information (static) */
158 unsigned int ns_blocksize_bits; 153 unsigned int ns_blocksize_bits;
159 unsigned long ns_nsegments; 154 unsigned long ns_nsegments;
@@ -186,7 +181,6 @@ static inline int nilfs_##name(struct the_nilfs *nilfs) \
186THE_NILFS_FNS(INIT, init) 181THE_NILFS_FNS(INIT, init)
187THE_NILFS_FNS(LOADED, loaded) 182THE_NILFS_FNS(LOADED, loaded)
188THE_NILFS_FNS(DISCONTINUED, discontinued) 183THE_NILFS_FNS(DISCONTINUED, discontinued)
189THE_NILFS_FNS(COND_NONGC_WRITE, cond_nongc_write)
190 184
191void nilfs_set_last_segment(struct the_nilfs *, sector_t, u64, __u64); 185void nilfs_set_last_segment(struct the_nilfs *, sector_t, u64, __u64);
192struct the_nilfs *alloc_nilfs(struct block_device *); 186struct the_nilfs *alloc_nilfs(struct block_device *);