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

Commit 55a8a844 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: switch discard_policy.timeout to bool type 



While checking discard timeout, we use specified type
UMOUNT_DISCARD_TIMEOUT, so just replace doplicy.timeout with
it, and switch doplicy.timeout to bool type.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent ea49be2a

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -330,8 +330,8 @@ struct discard_policy { 
	bool io_aware;			/* issue discard in idle time */

	bool sync;			/* submit discard with REQ_SYNC flag */

	bool ordered;			/* issue discard by lba order */

	bool timeout;			/* discard timeout for put_super */

	unsigned int granularity;	/* discard granularity */

	int timeout;			/* discard timeout for put_super */

};



struct discard_cmd_control {

fs/f2fs/segment.c

+8 −8
Original line number Diff line number Diff line
@@ -1080,7 +1080,7 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi, 


	dpolicy->max_requests = DEF_MAX_DISCARD_REQUEST;

	dpolicy->io_aware_gran = MAX_PLIST_NUM;

	dpolicy->timeout = 0;

	dpolicy->timeout = false;



	if (discard_type == DPOLICY_BG) {

		dpolicy->min_interval = DEF_MIN_DISCARD_ISSUE_TIME;
@@ -1105,6 +1105,7 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi, 
		dpolicy->io_aware = false;

		/* we need to issue all to keep CP_TRIMMED_FLAG */

		dpolicy->granularity = 1;

		dpolicy->timeout = true;

	}

}
@@ -1473,12 +1474,12 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, 
	int i, issued = 0;

	bool io_interrupted = false;



	if (dpolicy->timeout != 0)

		f2fs_update_time(sbi, dpolicy->timeout);

	if (dpolicy->timeout)

		f2fs_update_time(sbi, UMOUNT_DISCARD_TIMEOUT);



	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {

		if (dpolicy->timeout != 0 &&

				f2fs_time_over(sbi, dpolicy->timeout))

		if (dpolicy->timeout &&

				f2fs_time_over(sbi, UMOUNT_DISCARD_TIMEOUT))

			break;



		if (i + 1 < dpolicy->granularity)
@@ -1499,8 +1500,8 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, 
		list_for_each_entry_safe(dc, tmp, pend_list, list) {

			f2fs_bug_on(sbi, dc->state != D_PREP);



			if (dpolicy->timeout != 0 &&

				f2fs_time_over(sbi, dpolicy->timeout))

			if (dpolicy->timeout &&

				f2fs_time_over(sbi, UMOUNT_DISCARD_TIMEOUT))

				break;



			if (dpolicy->io_aware && i < dpolicy->io_aware_gran &&
@@ -1679,7 +1680,6 @@ bool f2fs_issue_discard_timeout(struct f2fs_sb_info *sbi) 


	__init_discard_policy(sbi, &dpolicy, DPOLICY_UMOUNT,

					dcc->discard_granularity);

	dpolicy.timeout = UMOUNT_DISCARD_TIMEOUT;

	__issue_discard_cmd(sbi, &dpolicy);

	dropped = __drop_discard_cmd(sbi);