aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nilfs2_fs.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 /include/linux/nilfs2_fs.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 'include/linux/nilfs2_fs.h')
-rw-r--r--include/linux/nilfs2_fs.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h
index e38fad2f7c0b..b0a6b39eedbc 100644
--- a/include/linux/nilfs2_fs.h
+++ b/include/linux/nilfs2_fs.h
@@ -763,18 +763,6 @@ struct nilfs_bdesc {
763 __u32 bd_level; 763 __u32 bd_level;
764}; 764};
765 765
766#define NILFS_TIMEDWAIT_WRITE_LOCKED 0x1
767#define NILFS_TIMEDWAIT_SEG_WRITE 0x2
768
769/**
770 * struct nilfs_wait_cond -
771 */
772struct nilfs_wait_cond {
773 int wc_cond;
774 int wc_flags;
775 struct timespec wc_timeout;
776};
777
778#define NILFS_IOCTL_IDENT 'n' 766#define NILFS_IOCTL_IDENT 'n'
779 767
780#define NILFS_IOCTL_CHANGE_CPMODE \ 768#define NILFS_IOCTL_CHANGE_CPMODE \
@@ -795,8 +783,6 @@ struct nilfs_wait_cond {
795 _IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv) 783 _IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv)
796#define NILFS_IOCTL_CLEAN_SEGMENTS \ 784#define NILFS_IOCTL_CLEAN_SEGMENTS \
797 _IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv[5]) 785 _IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv[5])
798#define NILFS_IOCTL_TIMEDWAIT \
799 _IOWR(NILFS_IOCTL_IDENT, 0x89, struct nilfs_wait_cond)
800#define NILFS_IOCTL_SYNC \ 786#define NILFS_IOCTL_SYNC \
801 _IOR(NILFS_IOCTL_IDENT, 0x8A, __u64) 787 _IOR(NILFS_IOCTL_IDENT, 0x8A, __u64)
802#define NILFS_IOCTL_RESIZE \ 788#define NILFS_IOCTL_RESIZE \
@@ -827,12 +813,6 @@ struct nilfs_sustat32 {
827 compat_time_t ss_nongc_ctime; 813 compat_time_t ss_nongc_ctime;
828}; 814};
829 815
830struct nilfs_wait_cond32 {
831 compat_int_t wc_cond;
832 compat_int_t wc_flags;
833 struct compat_timespec wc_timeout;
834};
835
836#define NILFS_IOCTL32_CHANGE_CPMODE \ 816#define NILFS_IOCTL32_CHANGE_CPMODE \
837 _IOW(NILFS_IOCTL_IDENT, 0x80, struct nilfs_cpmode32) 817 _IOW(NILFS_IOCTL_IDENT, 0x80, struct nilfs_cpmode32)
838#define NILFS_IOCTL32_GET_CPINFO \ 818#define NILFS_IOCTL32_GET_CPINFO \
@@ -847,8 +827,6 @@ struct nilfs_wait_cond32 {
847 _IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv32) 827 _IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv32)
848#define NILFS_IOCTL32_CLEAN_SEGMENTS \ 828#define NILFS_IOCTL32_CLEAN_SEGMENTS \
849 _IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv32[5]) 829 _IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv32[5])
850#define NILFS_IOCTL32_TIMEDWAIT \
851 _IOWR(NILFS_IOCTL_IDENT, 0x89, struct nilfs_wait_cond32)
852#endif /* CONFIG_COMPAT */ 830#endif /* CONFIG_COMPAT */
853 831
854#endif /* _LINUX_NILFS_FS_H */ 832#endif /* _LINUX_NILFS_FS_H */