From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 08/18] nfs: add readlink support
Date: Fri, 24 Aug 2012 06:50:08 +0200 [thread overview]
Message-ID: <1345783818-28784-8-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1345783818-28784-1-git-send-email-plagnioj@jcrosoft.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
fs/nfs.c | 93 +++++++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 65 insertions(+), 28 deletions(-)
diff --git a/fs/nfs.c b/fs/nfs.c
index 79e667f..a4e1f91 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -605,34 +605,6 @@ static int nfs_read_req(struct file_priv *priv, int offset, int readlen)
return 0;
}
-#if 0
-static int nfs_readlink_reply(unsigned char *pkt, unsigned len)
-{
- uint32_t *data;
- char *path;
- int rlen;
-// int ret;
-
- data = (uint32_t *)(pkt + sizeof(struct rpc_reply));
-
- data++;
-
- rlen = ntohl(net_read_uint32(data)); /* new path length */
-
- data++;
- path = (char *)data;
-
- if (*path != '/') {
- strcat(nfs_path, "/");
- strncat(nfs_path, path, rlen);
- } else {
- memcpy(nfs_path, path, rlen);
- nfs_path[rlen] = 0;
- }
- return 0;
-}
-#endif
-
static void nfs_handler(void *ctx, char *packet, unsigned len)
{
char *pkt = net_eth_to_udp_payload(packet);
@@ -742,6 +714,70 @@ static struct file_priv *nfs_do_stat(struct device_d *dev, const char *filename,
return priv;
}
+static int nfs_readlink_req(struct file_priv *priv, char* buf, size_t size)
+{
+ uint32_t data[1024];
+ uint32_t *p;
+ int len;
+ int ret;
+ char *path;
+ uint32_t *filedata;
+
+ p = &(data[0]);
+ p = rpc_add_credentials(p);
+
+ memcpy(p, priv->filefh, NFS_FHSIZE);
+ p += (NFS_FHSIZE / 4);
+
+ len = p - &(data[0]);
+
+ ret = rpc_req(priv->npriv, PROG_NFS, NFS_READLINK, data, len);
+ if (ret)
+ return ret;
+
+ filedata = nfs_packet + sizeof(struct rpc_reply);
+ filedata++;
+
+ len = ntohl(net_read_uint32(filedata)); /* new path length */
+ filedata++;
+
+ path = (char *)filedata;
+
+ if (len > size)
+ len = size;
+
+ memcpy(buf, path, len);
+ buf[len] = 0;
+
+ return 0;
+}
+
+static int nfs_readlink(struct device_d *dev, const char *filename,
+ char *realname, size_t size)
+{
+ struct file_priv *priv;
+ int ret;
+ struct stat s;
+
+ priv = nfs_do_stat(dev, filename, &s);
+ if (IS_ERR(priv))
+ return PTR_ERR(priv);
+
+
+ if (S_ISDIR(s.st_mode))
+ strcat(realname, filename);
+ else
+ strcat(realname, dirname((char*)filename));
+
+ ret = nfs_readlink_req(priv, realname, size);
+ if (ret) {
+ nfs_do_close(priv);
+ return ret;
+ }
+
+ return 0;
+}
+
static int nfs_open(struct device_d *dev, FILE *file, const char *filename)
{
struct file_priv *priv;
@@ -1039,6 +1075,7 @@ static struct fs_driver_d nfs_driver = {
.rmdir = nfs_rmdir,
.write = nfs_write,
.truncate = nfs_truncate,
+ .readlink = nfs_readlink,
.flags = 0,
.drv = {
.probe = nfs_probe,
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-08-24 4:50 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-24 4:46 [PATCH 00/18] fs: add symlink and " Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 01/18] fs: add " Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 02/18] fs: rename stat to lstat as we implement lstat Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 03/18] fs: add symlink support Jean-Christophe PLAGNIOL-VILLARD
2012-08-27 13:35 ` Sascha Hauer
2012-09-01 10:42 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 04/18] fs: implement stat Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 9:25 ` Roberto Nibali
2012-08-24 18:47 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-27 13:52 ` Sascha Hauer
2012-09-01 10:39 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 05/18] fs: open: add symlink support Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 06/18] fs: introduce get_mounted_path to get the path where a file is mounted Jean-Christophe PLAGNIOL-VILLARD
2012-08-27 13:53 ` Sascha Hauer
2012-09-01 10:37 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 07/18] ramfs: add symlink and readlink support Jean-Christophe PLAGNIOL-VILLARD
2012-08-27 13:59 ` Sascha Hauer
2012-08-29 5:21 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-08-27 14:04 ` [PATCH 08/18] nfs: add " Sascha Hauer
2012-08-24 4:50 ` [PATCH 09/18] test: add -L support to test if it's a symbolic link Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 10/18] commands: add readlink support Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 9:31 ` Roberto Nibali
2012-08-24 18:46 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 11/18] command: add ln support Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 12/18] ls: add symlink support to -l Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 13/18] dirname: add -V option to return only path related to the mountpoint Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 14/18] recursive_action: add ACTION_FOLLOWLINKS support Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 15/18] evnfs: introduce major and minor Jean-Christophe PLAGNIOL-VILLARD
2012-08-27 14:12 ` Sascha Hauer
2012-08-29 5:23 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 16/18] envfs: add support of variable inode size Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 17/18] envfs: add support of symlink Jean-Christophe PLAGNIOL-VILLARD
2012-08-24 4:50 ` [PATCH 18/18] defautenv: " Jean-Christophe PLAGNIOL-VILLARD
2012-08-27 13:25 ` [PATCH 01/18] fs: add readlink support Sascha Hauer
2012-09-01 10:50 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-01 12:35 [PATCH 00/18 v2] fs: add symlink and " Jean-Christophe PLAGNIOL-VILLARD
2012-09-01 12:37 ` [PATCH 01/18] fs: add " Jean-Christophe PLAGNIOL-VILLARD
2012-09-01 12:37 ` [PATCH 08/18] nfs: " Jean-Christophe PLAGNIOL-VILLARD
2012-09-03 10:04 [PATCH 00/18 v3] fs: add symlink and " Jean-Christophe PLAGNIOL-VILLARD
2012-09-03 10:08 ` [PATCH 01/18] fs: add " Jean-Christophe PLAGNIOL-VILLARD
2012-09-03 10:08 ` [PATCH 08/18] nfs: " Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345783818-28784-8-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox