Commit 83085935 authored by Misono, Tomohiro's avatar Misono, Tomohiro Committed by David Sterba
Browse files

btrfs: remove unused setup_root_args() 



Since setup_root_args() is not used anymore, just remove it.

Signed-off-by: default avatarTomohiro Misono <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d7407606

fs/btrfs/super.c

+0 −36
Original line number Diff line number Diff line
@@ -1407,42 +1407,6 @@ static inline int is_subvolume_inode(struct inode *inode) 
	return 0;

}



/*

 * This will add subvolid=0 to the argument string while removing any subvol=

 * and subvolid= arguments to make sure we get the top-level root for path

 * walking to the subvol we want.

 */

static char *setup_root_args(char *args)

{

	char *buf, *dst, *sep;



	if (!args)

		return kstrdup("subvolid=0", GFP_KERNEL);



	/* The worst case is that we add ",subvolid=0" to the end. */

	buf = dst = kmalloc(strlen(args) + strlen(",subvolid=0") + 1,

			GFP_KERNEL);

	if (!buf)

		return NULL;



	while (1) {

		sep = strchrnul(args, ',');

		if (!strstarts(args, "subvol=") &&

		    !strstarts(args, "subvolid=")) {

			memcpy(dst, args, sep - args);

			dst += sep - args;

			*dst++ = ',';

		}

		if (*sep)

			args = sep + 1;

		else

			break;

	}

	strcpy(dst, "subvolid=0");



	return buf;

}



static struct dentry *mount_subvol(const char *subvol_name, u64 subvol_objectid,

				   int flags, const char *device_name,

				   char *data, struct vfsmount *mnt)