From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Thu, 28 Sep 2023 04:50:27 +0000 (-0400)
Subject: bcachefs: Use strsep() in split_devs()
X-Git-Tag: v6.7-rc1~201^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc08c661a291f5e479fdde8322a4c295c69a3aef;p=thirdparty%2Flinux.git

bcachefs: Use strsep() in split_devs()

Minor refactoring to fix a smatch complaint.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index 73a3cebd734ff..bc009ef497d0f 100644
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -1595,7 +1595,7 @@ static struct bch_fs *bch2_path_to_fs(const char *path)
 static char **split_devs(const char *_dev_name, unsigned *nr)
 {
 	char *dev_name = NULL, **devs = NULL, *s;
-	size_t i, nr_devs = 0;
+	size_t i = 0, nr_devs = 0;
 
 	dev_name = kstrdup(_dev_name, GFP_KERNEL);
 	if (!dev_name)
@@ -1610,9 +1610,7 @@ static char **split_devs(const char *_dev_name, unsigned *nr)
 		return NULL;
 	}
 
-	for (i = 0, s = dev_name;
-	     s;
-	     (s = strchr(s, ':')) && (*s++ = '\0'))
+	while ((s = strsep(&dev_name, ":")))
 		devs[i++] = s;
 
 	*nr = nr_devs;