Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40bfa16d authored by Tao Ma's avatar Tao Ma Committed by Jan Kara
Browse files

ext3: Remove the obsolete broken EXT3_IOC32_WAIT_FOR_READONLY. 



There are no user of EXT3_IOC32_WAIT_FOR_READONLY and also it is
broken. No one set the set_ro_timer, no one wake up us and our
state is set to TASK_INTERRUPTIBLE not RUNNING. So remove it.

Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarTao Ma <boyu.mt@taobao.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent bc112323

fs/ext3/ioctl.c

+0 −24
Original line number Diff line number Diff line
@@ -150,30 +150,6 @@ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		mnt_drop_write(filp->f_path.mnt);

		return err;

	}

#ifdef CONFIG_JBD_DEBUG

	case EXT3_IOC_WAIT_FOR_READONLY:

		/*

		 * This is racy - by the time we're woken up and running,

		 * the superblock could be released.  And the module could

		 * have been unloaded.  So sue me.

		 *

		 * Returns 1 if it slept, else zero.

		 */

		{

			struct super_block *sb = inode->i_sb;

			DECLARE_WAITQUEUE(wait, current);

			int ret = 0;



			set_current_state(TASK_INTERRUPTIBLE);

			add_wait_queue(&EXT3_SB(sb)->ro_wait_queue, &wait);

			if (timer_pending(&EXT3_SB(sb)->turn_ro_timer)) {

				schedule();

				ret = 1;

			}

			remove_wait_queue(&EXT3_SB(sb)->ro_wait_queue, &wait);

			return ret;

		}

#endif

	case EXT3_IOC_GETRSVSZ:

		if (test_opt(inode->i_sb, RESERVATION)

			&& S_ISREG(inode->i_mode)

include/linux/ext3_fs_sb.h

+0 −4
Original line number Diff line number Diff line
@@ -76,10 +76,6 @@ struct ext3_sb_info { 
	struct mutex s_resize_lock;

	unsigned long s_commit_interval;

	struct block_device *journal_bdev;

#ifdef CONFIG_JBD_DEBUG

	struct timer_list turn_ro_timer;	/* For turning read-only (crash simulation) */

	wait_queue_head_t ro_wait_queue;	/* For people waiting for the fs to go read-only */

#endif

#ifdef CONFIG_QUOTA

	char *s_qf_names[MAXQUOTAS];		/* Names of quota files with journalled quota */

	int s_jquota_fmt;			/* Format of quota to use */