Commit 46b27f50 authored by Dennis Zhou's avatar Dennis Zhou Committed by David Sterba
Browse files

btrfs: rename DISCARD mount option to to DISCARD_SYNC 



This series introduces async discard which will use the flag
DISCARD_ASYNC, so rename the original flag to DISCARD_SYNC as it is
synchronously done in transaction commit.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarDennis Zhou <dennis@kernel.org>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e837dfde

fs/btrfs/block-group.c

+1 −1
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info) 
		spin_unlock(&space_info->lock);



		/* DISCARD can flip during remount */

		trimming = btrfs_test_opt(fs_info, DISCARD);

		trimming = btrfs_test_opt(fs_info, DISCARD_SYNC);



		/* Implicit trim during transaction commit. */

		if (trimming)

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info) 
#define BTRFS_MOUNT_FLUSHONCOMMIT       (1 << 7)

#define BTRFS_MOUNT_SSD_SPREAD		(1 << 8)

#define BTRFS_MOUNT_NOSSD		(1 << 9)

#define BTRFS_MOUNT_DISCARD		(1 << 10)

#define BTRFS_MOUNT_DISCARD_SYNC	(1 << 10)

#define BTRFS_MOUNT_FORCE_COMPRESS      (1 << 11)

#define BTRFS_MOUNT_SPACE_CACHE		(1 << 12)

#define BTRFS_MOUNT_CLEAR_CACHE		(1 << 13)

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -2923,7 +2923,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans) 
			break;

		}



		if (btrfs_test_opt(fs_info, DISCARD))

		if (btrfs_test_opt(fs_info, DISCARD_SYNC))

			ret = btrfs_discard_extent(fs_info, start,

						   end + 1 - start, NULL);

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2584,7 +2584,7 @@ out: 
			 * Discard the range before returning it back to the

			 * free space pool

			 */

			if (ret && btrfs_test_opt(fs_info, DISCARD))

			if (ret && btrfs_test_opt(fs_info, DISCARD_SYNC))

				btrfs_discard_extent(fs_info,

						ordered_extent->disk_bytenr,

						ordered_extent->disk_num_bytes,

fs/btrfs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -695,11 +695,11 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, 
				   info->metadata_ratio);

			break;

		case Opt_discard:

			btrfs_set_and_info(info, DISCARD,

					   "turning on discard");

			btrfs_set_and_info(info, DISCARD_SYNC,

					   "turning on sync discard");

			break;

		case Opt_nodiscard:

			btrfs_clear_and_info(info, DISCARD,

			btrfs_clear_and_info(info, DISCARD_SYNC,

					     "turning off discard");

			break;

		case Opt_space_cache:
@@ -1322,7 +1322,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry) 
		seq_puts(seq, ",nologreplay");

	if (btrfs_test_opt(info, FLUSHONCOMMIT))

		seq_puts(seq, ",flushoncommit");

	if (btrfs_test_opt(info, DISCARD))

	if (btrfs_test_opt(info, DISCARD_SYNC))

		seq_puts(seq, ",discard");

	if (!(info->sb->s_flags & SB_POSIXACL))

		seq_puts(seq, ",noacl");

CRA Git | Maintained and supported by SUSTech CRA and CCSE