[1/2] NFS: Replace various occurrences of kstrndup() with kmemdup_nul()

Commit Message

Trond Myklebust Feb. 2, 2020, 10:57 p.m. UTC

When we already know the string length, it is more efficient to
use kmemdup_nul().

Signed-off-by: Trond Myklebust <[e-mail]>
---
 fs/nfs/dns_resolve.c   | 2 +-
 fs/nfs/nfs4namespace.c | 2 +-
 fs/nfs/super.c         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/fs/nfs/dns_resolve.c b/fs/nfs/dns_resolve.c
index aec769a500a1..89bd5581f317 100644
--- a/fs/nfs/dns_resolve.c
+++ b/fs/nfs/dns_resolve.c
@@ -93,7 +93,7 @@  static void nfs_dns_ent_init(struct cache_head *cnew,
 	key = container_of(ckey, struct nfs_dns_ent, h);
 
 	kfree(new->hostname);
-	new->hostname = kstrndup(key->hostname, key->namelen, GFP_KERNEL);
+	new->hostname = kmemdup_nul(key->hostname, key->namelen, GFP_KERNEL);
 	if (new->hostname) {
 		new->namelen = key->namelen;
 		nfs_dns_ent_update(cnew, ckey);
diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 513c272b05a9..4ea134ab56ab 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -452,7 +452,7 @@  static int nfs4_try_replacing_one_location(struct nfs_server *server,
 		rpc_set_port(sap, NFS_PORT);
 
 		error = -ENOMEM;
-		hostname = kstrndup(buf->data, buf->len, GFP_KERNEL);
+		hostname = kmemdup_nul(buf->data, buf->len, GFP_KERNEL);
 		if (hostname == NULL)
 			break;
 
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 928f22c76b43..9872ece28627 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1969,13 +1969,13 @@  static int nfs_parse_devname(const char *dev_name,
 		goto out_hostname;
 
 	/* N.B. caller will free nfs_server.hostname in all cases */
-	*hostname = kstrndup(dev_name, len, GFP_KERNEL);
+	*hostname = kmemdup_nul(dev_name, len, GFP_KERNEL);
 	if (*hostname == NULL)
 		goto out_nomem;
 	len = strlen(++end);
 	if (len > maxpathlen)
 		goto out_path;
-	*export_path = kstrndup(end, len, GFP_KERNEL);
+	*export_path = kmemdup_nul(end, len, GFP_KERNEL);
 	if (!*export_path)
 		goto out_nomem;