Commit 0cbc3002 authored by David Disseldorp's avatar David Disseldorp Committed by Steve French
Browse files

smb/client: remove unused smb3_parse_opt() 



Commit abdb1742 ("cifs: get rid of mount options string parsing")
removed the last caller.

Signed-off-by: default avatarDavid Disseldorp <ddiss@suse.de>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 254f4963

fs/smb/client/cifsproto.h

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ int cifs_handle_standard(struct TCP_Server_Info *server, 
			 struct mid_q_entry *mid);

char *smb3_fs_context_fullpath(const struct smb3_fs_context *ctx, char dirsep);

int smb3_parse_devname(const char *devname, struct smb3_fs_context *ctx);

int smb3_parse_opt(const char *options, const char *key, char **val);

int cifs_ipaddr_cmp(struct sockaddr *srcaddr, struct sockaddr *rhs);

bool cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs);

int cifs_discard_remaining_data(struct TCP_Server_Info *server);

fs/smb/client/fs_context.c

+0 −31
Original line number Diff line number Diff line
@@ -536,37 +536,6 @@ cifs_parse_smb_version(struct fs_context *fc, char *value, struct smb3_fs_contex 
	return 0;

}



int smb3_parse_opt(const char *options, const char *key, char **val)

{

	int rc = -ENOENT;

	char *opts, *orig, *p;



	orig = opts = kstrdup(options, GFP_KERNEL);

	if (!opts)

		return -ENOMEM;



	while ((p = strsep(&opts, ","))) {

		char *nval;



		if (!*p)

			continue;

		if (strncasecmp(p, key, strlen(key)))

			continue;

		nval = strchr(p, '=');

		if (nval) {

			if (nval == p)

				continue;

			*nval++ = 0;

			*val = kstrdup(nval, GFP_KERNEL);

			rc = !*val ? -ENOMEM : 0;

			goto out;

		}

	}

out:

	kfree(orig);

	return rc;

}



/*

 * Remove duplicate path delimiters. Windows is supposed to do that

 * but there are some bugs that prevent rename from working if there are