aboutsummaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorSripathi Kodi <sripathik@in.ibm.com>2010-07-12 10:37:23 -0400
committerEric Van Hensbergen <ericvh@gmail.com>2010-08-02 15:25:09 -0400
commitf085312204f384a0277a66c3c48ba8f9edcd58f2 (patch)
tree33006860cc1cd4338de56ba1a9915ed95082814e /net/9p
parent9ffaf63e34821ea60b2e1c8593f968d73728f82b (diff)
9p: getattr client implementation for 9P2000.L protocol.
SYNOPSIS size[4] Tgetattr tag[2] fid[4] request_mask[8] size[4] Rgetattr tag[2] lstat[n] DESCRIPTION The getattr transaction inquires about the file identified by fid. request_mask is a bit mask that specifies which fields of the stat structure is the client interested in. The reply will contain a machine-independent directory entry, laid out as follows: st_result_mask[8] Bit mask that indicates which fields in the stat structure have been populated by the server qid.type[1] the type of the file (directory, etc.), represented as a bit vector corresponding to the high 8 bits of the file's mode word. qid.vers[4] version number for given path qid.path[8] the file server's unique identification for the file st_mode[4] Permission and flags st_uid[4] User id of owner st_gid[4] Group ID of owner st_nlink[8] Number of hard links st_rdev[8] Device ID (if special file) st_size[8] Size, in bytes st_blksize[8] Block size for file system IO st_blocks[8] Number of file system blocks allocated st_atime_sec[8] Time of last access, seconds st_atime_nsec[8] Time of last access, nanoseconds st_mtime_sec[8] Time of last modification, seconds st_mtime_nsec[8] Time of last modification, nanoseconds st_ctime_sec[8] Time of last status change, seconds st_ctime_nsec[8] Time of last status change, nanoseconds st_btime_sec[8] Time of creation (birth) of file, seconds st_btime_nsec[8] Time of creation (birth) of file, nanoseconds st_gen[8] Inode generation st_data_version[8] Data version number request_mask and result_mask bit masks contain the following bits #define P9_STATS_MODE 0x00000001ULL #define P9_STATS_NLINK 0x00000002ULL #define P9_STATS_UID 0x00000004ULL #define P9_STATS_GID 0x00000008ULL #define P9_STATS_RDEV 0x00000010ULL #define P9_STATS_ATIME 0x00000020ULL #define P9_STATS_MTIME 0x00000040ULL #define P9_STATS_CTIME 0x00000080ULL #define P9_STATS_INO 0x00000100ULL #define P9_STATS_SIZE 0x00000200ULL #define P9_STATS_BLOCKS 0x00000400ULL #define P9_STATS_BTIME 0x00000800ULL #define P9_STATS_GEN 0x00001000ULL #define P9_STATS_DATA_VERSION 0x00002000ULL #define P9_STATS_BASIC 0x000007ffULL #define P9_STATS_ALL 0x00003fffULL This patch implements the client side of getattr implementation for 9P2000.L. It introduces a new structure p9_stat_dotl for getting Linux stat information along with QID. The data layout is similar to stat structure in Linux user space with the following major differences: inode (st_ino) is not part of data. Instead qid is. device (st_dev) is not part of data because this doesn't make sense on the client. All time variables are 64 bit wide on the wire. The kernel seems to use 32 bit variables for these variables. However, some of the architectures have used 64 bit variables and glibc exposes 64 bit variables to user space on some architectures. Hence to be on the safer side we have made these 64 bit in the protocol. Refer to the comments in include/asm-generic/stat.h There are some additional fields: st_btime_sec, st_btime_nsec, st_gen, st_data_version apart from the bitmask, st_result_mask. The bit mask is filled by the server to indicate which stat fields have been populated by the server. Currently there is no clean way for the server to obtain these additional fields, so it sends back just the basic fields. Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com> Signed-off-by: Eric Van Hensbegren <ericvh@gmail.com>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/client.c59
-rw-r--r--net/9p/protocol.c28
2 files changed, 87 insertions, 0 deletions
diff --git a/net/9p/client.c b/net/9p/client.c
index 4ff068e98f76..5e97118da3bf 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1303,6 +1303,65 @@ error:
1303} 1303}
1304EXPORT_SYMBOL(p9_client_stat); 1304EXPORT_SYMBOL(p9_client_stat);
1305 1305
1306struct p9_stat_dotl *p9_client_getattr_dotl(struct p9_fid *fid,
1307 u64 request_mask)
1308{
1309 int err;
1310 struct p9_client *clnt;
1311 struct p9_stat_dotl *ret = kmalloc(sizeof(struct p9_stat_dotl),
1312 GFP_KERNEL);
1313 struct p9_req_t *req;
1314
1315 P9_DPRINTK(P9_DEBUG_9P, ">>> TGETATTR fid %d, request_mask %lld\n",
1316 fid->fid, request_mask);
1317
1318 if (!ret)
1319 return ERR_PTR(-ENOMEM);
1320
1321 err = 0;
1322 clnt = fid->clnt;
1323
1324 req = p9_client_rpc(clnt, P9_TGETATTR, "dq", fid->fid, request_mask);
1325 if (IS_ERR(req)) {
1326 err = PTR_ERR(req);
1327 goto error;
1328 }
1329
1330 err = p9pdu_readf(req->rc, clnt->proto_version, "A", ret);
1331 if (err) {
1332 p9pdu_dump(1, req->rc);
1333 p9_free_req(clnt, req);
1334 goto error;
1335 }
1336
1337 P9_DPRINTK(P9_DEBUG_9P,
1338 "<<< RGETATTR st_result_mask=%lld\n"
1339 "<<< qid=%x.%llx.%x\n"
1340 "<<< st_mode=%8.8x st_nlink=%llu\n"
1341 "<<< st_uid=%d st_gid=%d\n"
1342 "<<< st_rdev=%llx st_size=%llx st_blksize=%llu st_blocks=%llu\n"
1343 "<<< st_atime_sec=%lld st_atime_nsec=%lld\n"
1344 "<<< st_mtime_sec=%lld st_mtime_nsec=%lld\n"
1345 "<<< st_ctime_sec=%lld st_ctime_nsec=%lld\n"
1346 "<<< st_btime_sec=%lld st_btime_nsec=%lld\n"
1347 "<<< st_gen=%lld st_data_version=%lld",
1348 ret->st_result_mask, ret->qid.type, ret->qid.path,
1349 ret->qid.version, ret->st_mode, ret->st_nlink, ret->st_uid,
1350 ret->st_gid, ret->st_rdev, ret->st_size, ret->st_blksize,
1351 ret->st_blocks, ret->st_atime_sec, ret->st_atime_nsec,
1352 ret->st_mtime_sec, ret->st_mtime_nsec, ret->st_ctime_sec,
1353 ret->st_ctime_nsec, ret->st_btime_sec, ret->st_btime_nsec,
1354 ret->st_gen, ret->st_data_version);
1355
1356 p9_free_req(clnt, req);
1357 return ret;
1358
1359error:
1360 kfree(ret);
1361 return ERR_PTR(err);
1362}
1363EXPORT_SYMBOL(p9_client_getattr_dotl);
1364
1306static int p9_client_statsize(struct p9_wstat *wst, int proto_version) 1365static int p9_client_statsize(struct p9_wstat *wst, int proto_version)
1307{ 1366{
1308 int ret; 1367 int ret;
diff --git a/net/9p/protocol.c b/net/9p/protocol.c
index b645c8263538..3e4f77695891 100644
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@ -141,6 +141,7 @@ pdu_write_u(struct p9_fcall *pdu, const char __user *udata, size_t size)
141 D - data blob (int32_t size followed by void *, results are not freed) 141 D - data blob (int32_t size followed by void *, results are not freed)
142 T - array of strings (int16_t count, followed by strings) 142 T - array of strings (int16_t count, followed by strings)
143 R - array of qids (int16_t count, followed by qids) 143 R - array of qids (int16_t count, followed by qids)
144 A - stat for 9p2000.L (p9_stat_dotl)
144 ? - if optional = 1, continue parsing 145 ? - if optional = 1, continue parsing
145*/ 146*/
146 147
@@ -340,6 +341,33 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,
340 } 341 }
341 } 342 }
342 break; 343 break;
344 case 'A': {
345 struct p9_stat_dotl *stbuf =
346 va_arg(ap, struct p9_stat_dotl *);
347
348 memset(stbuf, 0, sizeof(struct p9_stat_dotl));
349 errcode =
350 p9pdu_readf(pdu, proto_version,
351 "qQdddqqqqqqqqqqqqqqq",
352 &stbuf->st_result_mask,
353 &stbuf->qid,
354 &stbuf->st_mode,
355 &stbuf->st_uid, &stbuf->st_gid,
356 &stbuf->st_nlink,
357 &stbuf->st_rdev, &stbuf->st_size,
358 &stbuf->st_blksize, &stbuf->st_blocks,
359 &stbuf->st_atime_sec,
360 &stbuf->st_atime_nsec,
361 &stbuf->st_mtime_sec,
362 &stbuf->st_mtime_nsec,
363 &stbuf->st_ctime_sec,
364 &stbuf->st_ctime_nsec,
365 &stbuf->st_btime_sec,
366 &stbuf->st_btime_nsec,
367 &stbuf->st_gen,
368 &stbuf->st_data_version);
369 }
370 break;
343 case '?': 371 case '?':
344 if ((proto_version != p9_proto_2000u) && 372 if ((proto_version != p9_proto_2000u) &&
345 (proto_version != p9_proto_2000L)) 373 (proto_version != p9_proto_2000L))