From: "Misono, Tomohiro" <misono.tomohiro@jp.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Subject: [PATCH v4 4/4] btrfs: remove unused setup_root_args()
Date: Thu, 14 Dec 2017 17:25:54 +0900 [thread overview]
Message-ID: <2c50988d-49ab-6eae-bcaa-3fe81bce60dd@jp.fujitsu.com> (raw)
In-Reply-To: <7dbb897c-1f1d-b54b-0cea-2a1c6c1d5027@jp.fujitsu.com>
Since setup_root_args() is not used anymore, just remove it.
Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
---
fs/btrfs/super.c | 36 ------------------------------------
1 file changed, 36 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index f0ecba7a1190..7da78cb8a946 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1409,42 +1409,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)
--
2.13.6
next prev parent reply other threads:[~2017-12-14 8:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-14 8:23 [PATCH v4 0/4] btrfs: cleanup mount path Misono, Tomohiro
2017-12-14 8:24 ` [PATCH v4 1/4] btrfs: add btrfs_mount_root() and new file_system_type Misono, Tomohiro
2017-12-14 8:25 ` [PATCH v4 2/4] btrfs: cleanup btrfs_mount() using btrfs_mount_root() Misono, Tomohiro
2018-01-12 10:14 ` Anand Jain
2018-01-15 8:24 ` Misono, Tomohiro
2018-01-15 19:26 ` David Sterba
2018-01-16 11:45 ` Anand Jain
2018-01-17 8:30 ` Misono, Tomohiro
2018-01-18 4:48 ` Anand Jain
2018-01-18 16:26 ` David Sterba
2017-12-14 8:25 ` [PATCH v4 3/4] btrfs: split parse_early_options() in two Misono, Tomohiro
2017-12-14 8:25 ` Misono, Tomohiro [this message]
2017-12-14 14:21 ` [PATCH v4 0/4] btrfs: cleanup mount path David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c50988d-49ab-6eae-bcaa-3fe81bce60dd@jp.fujitsu.com \
--to=misono.tomohiro@jp.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox