nfs: drop an unneeded variable from nfs_do_open()
While at it also fix the type of flen holding a string length (int -> size_t). Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
0f2c0a7edd
commit
e668dc5336
18
fs/nfs.c
18
fs/nfs.c
|
@ -616,7 +616,7 @@ static struct file_priv *nfs_do_open(struct device_d *dev, const char *filename)
|
||||||
struct file_priv *priv;
|
struct file_priv *priv;
|
||||||
struct nfs_priv *npriv = dev->priv;
|
struct nfs_priv *npriv = dev->priv;
|
||||||
int ret;
|
int ret;
|
||||||
const char *fname, *tok;
|
const char *tok;
|
||||||
|
|
||||||
priv = xzalloc(sizeof(*priv));
|
priv = xzalloc(sizeof(*priv));
|
||||||
|
|
||||||
|
@ -629,25 +629,23 @@ static struct file_priv *nfs_do_open(struct device_d *dev, const char *filename)
|
||||||
|
|
||||||
filename++;
|
filename++;
|
||||||
|
|
||||||
fname = filename;
|
|
||||||
|
|
||||||
memcpy(priv->filefh, npriv->rootfh, NFS_FHSIZE);
|
memcpy(priv->filefh, npriv->rootfh, NFS_FHSIZE);
|
||||||
|
|
||||||
while (*fname) {
|
while (*filename) {
|
||||||
int flen;
|
size_t flen;
|
||||||
|
|
||||||
tok = strchr(fname, '/');
|
tok = strchr(filename, '/');
|
||||||
if (tok)
|
if (tok)
|
||||||
flen = tok - fname;
|
flen = tok - filename;
|
||||||
else
|
else
|
||||||
flen = strlen(fname);
|
flen = strlen(filename);
|
||||||
|
|
||||||
ret = nfs_lookup_req(priv, fname, flen);
|
ret = nfs_lookup_req(priv, filename, flen);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (tok)
|
if (tok)
|
||||||
fname += flen + 1;
|
filename += flen + 1;
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue