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>
This commit is contained in:

committed by
Linus Torvalds

parent
76068c4ff1
commit
1088dcf4c3
@@ -763,18 +763,6 @@ struct nilfs_bdesc {
|
||||
__u32 bd_level;
|
||||
};
|
||||
|
||||
#define NILFS_TIMEDWAIT_WRITE_LOCKED 0x1
|
||||
#define NILFS_TIMEDWAIT_SEG_WRITE 0x2
|
||||
|
||||
/**
|
||||
* struct nilfs_wait_cond -
|
||||
*/
|
||||
struct nilfs_wait_cond {
|
||||
int wc_cond;
|
||||
int wc_flags;
|
||||
struct timespec wc_timeout;
|
||||
};
|
||||
|
||||
#define NILFS_IOCTL_IDENT 'n'
|
||||
|
||||
#define NILFS_IOCTL_CHANGE_CPMODE \
|
||||
@@ -795,8 +783,6 @@ struct nilfs_wait_cond {
|
||||
_IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv)
|
||||
#define NILFS_IOCTL_CLEAN_SEGMENTS \
|
||||
_IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv[5])
|
||||
#define NILFS_IOCTL_TIMEDWAIT \
|
||||
_IOWR(NILFS_IOCTL_IDENT, 0x89, struct nilfs_wait_cond)
|
||||
#define NILFS_IOCTL_SYNC \
|
||||
_IOR(NILFS_IOCTL_IDENT, 0x8A, __u64)
|
||||
#define NILFS_IOCTL_RESIZE \
|
||||
@@ -827,12 +813,6 @@ struct nilfs_sustat32 {
|
||||
compat_time_t ss_nongc_ctime;
|
||||
};
|
||||
|
||||
struct nilfs_wait_cond32 {
|
||||
compat_int_t wc_cond;
|
||||
compat_int_t wc_flags;
|
||||
struct compat_timespec wc_timeout;
|
||||
};
|
||||
|
||||
#define NILFS_IOCTL32_CHANGE_CPMODE \
|
||||
_IOW(NILFS_IOCTL_IDENT, 0x80, struct nilfs_cpmode32)
|
||||
#define NILFS_IOCTL32_GET_CPINFO \
|
||||
@@ -847,8 +827,6 @@ struct nilfs_wait_cond32 {
|
||||
_IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv32)
|
||||
#define NILFS_IOCTL32_CLEAN_SEGMENTS \
|
||||
_IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv32[5])
|
||||
#define NILFS_IOCTL32_TIMEDWAIT \
|
||||
_IOWR(NILFS_IOCTL_IDENT, 0x89, struct nilfs_wait_cond32)
|
||||
#endif /* CONFIG_COMPAT */
|
||||
|
||||
#endif /* _LINUX_NILFS_FS_H */
|
||||
|
Reference in New Issue
Block a user