diff options
author | Tao Ma <boyu.mt@taobao.com> | 2011-10-08 15:56:35 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2011-10-08 15:56:35 -0400 |
commit | 7fd59c83b05dc1b8af2be4d991ee376f782cd8b0 (patch) | |
tree | 0d320a397b687f822167749afbb11d89d9f21a66 /fs/ext4/ioctl.c | |
parent | df3ab17072c31fbd394614711772682f0a956a2c (diff) |
ext4: remove the obsolete/broken EXT4_IOC_WAIT_FOR_READONLY ioctl
There are no users of the EXT4_IOC_WAIT_FOR_READONLY ioctl, and it is
also broken. No one sets the set_ro_timer, no one wakes up us and our
state is set to TASK_INTERRUPTIBLE not RUNNING. So remove it.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ioctl.c')
-rw-r--r-- | fs/ext4/ioctl.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 2046d699b4a7..8f7ea6905421 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c | |||
@@ -174,29 +174,6 @@ setversion_out: | |||
174 | mnt_drop_write(filp->f_path.mnt); | 174 | mnt_drop_write(filp->f_path.mnt); |
175 | return err; | 175 | return err; |
176 | } | 176 | } |
177 | #ifdef CONFIG_JBD2_DEBUG | ||
178 | case EXT4_IOC_WAIT_FOR_READONLY: | ||
179 | /* | ||
180 | * This is racy - by the time we're woken up and running, | ||
181 | * the superblock could be released. And the module could | ||
182 | * have been unloaded. So sue me. | ||
183 | * | ||
184 | * Returns 1 if it slept, else zero. | ||
185 | */ | ||
186 | { | ||
187 | DECLARE_WAITQUEUE(wait, current); | ||
188 | int ret = 0; | ||
189 | |||
190 | set_current_state(TASK_INTERRUPTIBLE); | ||
191 | add_wait_queue(&EXT4_SB(sb)->ro_wait_queue, &wait); | ||
192 | if (timer_pending(&EXT4_SB(sb)->turn_ro_timer)) { | ||
193 | schedule(); | ||
194 | ret = 1; | ||
195 | } | ||
196 | remove_wait_queue(&EXT4_SB(sb)->ro_wait_queue, &wait); | ||
197 | return ret; | ||
198 | } | ||
199 | #endif | ||
200 | case EXT4_IOC_GROUP_EXTEND: { | 177 | case EXT4_IOC_GROUP_EXTEND: { |
201 | ext4_fsblk_t n_blocks_count; | 178 | ext4_fsblk_t n_blocks_count; |
202 | int err, err2=0; | 179 | int err, err2=0; |
@@ -421,11 +398,6 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
421 | case EXT4_IOC32_SETVERSION_OLD: | 398 | case EXT4_IOC32_SETVERSION_OLD: |
422 | cmd = EXT4_IOC_SETVERSION_OLD; | 399 | cmd = EXT4_IOC_SETVERSION_OLD; |
423 | break; | 400 | break; |
424 | #ifdef CONFIG_JBD2_DEBUG | ||
425 | case EXT4_IOC32_WAIT_FOR_READONLY: | ||
426 | cmd = EXT4_IOC_WAIT_FOR_READONLY; | ||
427 | break; | ||
428 | #endif | ||
429 | case EXT4_IOC32_GETRSVSZ: | 401 | case EXT4_IOC32_GETRSVSZ: |
430 | cmd = EXT4_IOC_GETRSVSZ; | 402 | cmd = EXT4_IOC_GETRSVSZ; |
431 | break; | 403 | break; |