[PATCH v2 06/11] nfs: drop an unneeded variable from nfs_do_open()
Uwe Kleine-König
u.kleine-koenig at pengutronix.de
Fri Feb 7 16:28:08 EST 2014
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 at pengutronix.de>
---
fs/nfs.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/nfs.c b/fs/nfs.c
index 761bfd626716..79df6a8e4f7a 100644
--- a/fs/nfs.c
+++ b/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 nfs_priv *npriv = dev->priv;
int ret;
- const char *fname, *tok;
+ const char *tok;
priv = xzalloc(sizeof(*priv));
@@ -629,25 +629,23 @@ static struct file_priv *nfs_do_open(struct device_d *dev, const char *filename)
filename++;
- fname = filename;
-
memcpy(priv->filefh, npriv->rootfh, NFS_FHSIZE);
- while (*fname) {
- int flen;
+ while (*filename) {
+ size_t flen;
- tok = strchr(fname, '/');
+ tok = strchr(filename, '/');
if (tok)
- flen = tok - fname;
+ flen = tok - filename;
else
- flen = strlen(fname);
+ flen = strlen(filename);
- ret = nfs_lookup_req(priv, fname, flen);
+ ret = nfs_lookup_req(priv, filename, flen);
if (ret)
goto out;
if (tok)
- fname += flen + 1;
+ filename += flen + 1;
else
break;
}
--
1.8.5.2
More information about the barebox
mailing list