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

Commit 91748467 authored by Akinobu Mita's avatar Akinobu Mita Committed by Chris Mason
Browse files

btrfs: use memparse 



Use memparse() instead of its own private implementation.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: linux-btrfs@vger.kernel.org
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 1406e432

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -2388,7 +2388,6 @@ void btrfs_sysfs_del_super(struct btrfs_fs_info *root); 
ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);



/* super.c */

u64 btrfs_parse_size(char *str);

int btrfs_parse_options(struct btrfs_root *root, char *options);

int btrfs_sync_fs(struct super_block *sb, int wait);

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static noinline int btrfs_ioctl_resize(struct btrfs_root *root, 
			mod = 1;

			sizestr++;

		}

		new_size = btrfs_parse_size(sizestr);

		new_size = memparse(sizestr, NULL);

		if (new_size == 0) {

			ret = -EINVAL;

			goto out_unlock;

fs/btrfs/super.c

+3 −28
Original line number Diff line number Diff line
@@ -96,31 +96,6 @@ static match_table_t tokens = { 
	{Opt_err, NULL},

};



u64 btrfs_parse_size(char *str)

{

	u64 res;

	int mult = 1;

	char *end;

	char last;



	res = simple_strtoul(str, &end, 10);



	last = end[0];

	if (isalpha(last)) {

		last = tolower(last);

		switch (last) {

		case 'g':

			mult *= 1024;

		case 'm':

			mult *= 1024;

		case 'k':

			mult *= 1024;

		}

		res = res * mult;

	}

	return res;

}



/*

 * Regular mount options parser.  Everything that is needed only when

 * reading in a new superblock is parsed here.
@@ -216,7 +191,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
		case Opt_max_extent:

			num = match_strdup(&args[0]);

			if (num) {

				info->max_extent = btrfs_parse_size(num);

				info->max_extent = memparse(num, NULL);

				kfree(num);



				info->max_extent = max_t(u64,
@@ -228,7 +203,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
		case Opt_max_inline:

			num = match_strdup(&args[0]);

			if (num) {

				info->max_inline = btrfs_parse_size(num);

				info->max_inline = memparse(num, NULL);

				kfree(num);



				if (info->max_inline) {
@@ -243,7 +218,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
		case Opt_alloc_start:

			num = match_strdup(&args[0]);

			if (num) {

				info->alloc_start = btrfs_parse_size(num);

				info->alloc_start = memparse(num, NULL);

				kfree(num);

				printk(KERN_INFO

					"btrfs: allocations start at %llu\n",