aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ.Bruce Fields <bfields@fieldses.org>2006-10-04 05:16:19 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:23 -0400
commit81c3f4130202a1dcb2b28ab56684eb5e9d43d8c1 (patch)
tree66f473d1a2bd63c60af47613c5ddb41339f18e07
parent933469190ed5915b0568bc564346bb8db718f460 (diff)
[PATCH] knfsd: nfsd4: xdr encoding for fs_locations
Encode fs_locations attribute. Signed-off-by: Manoj Naik <manoj@almaden.ibm.com> Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/nfsd/nfs4xdr.c125
-rw-r--r--include/linux/nfsd/nfsd.h3
2 files changed, 126 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 4cfacc557b40..0589852007e6 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1223,6 +1223,119 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
1223 stateowner->so_replay.rp_buflen); \ 1223 stateowner->so_replay.rp_buflen); \
1224 } } while (0); 1224 } } while (0);
1225 1225
1226/* Encode as an array of strings the string given with components
1227 * seperated @sep.
1228 */
1229static int nfsd4_encode_components(char sep, char *components,
1230 u32 **pp, int *buflen)
1231{
1232 u32 *p = *pp;
1233 u32 *countp = p;
1234 int strlen, count=0;
1235 char *str, *end;
1236
1237 dprintk("nfsd4_encode_components(%s)\n", components);
1238 if ((*buflen -= 4) < 0)
1239 return nfserr_resource;
1240 WRITE32(0); /* We will fill this in with @count later */
1241 end = str = components;
1242 while (*end) {
1243 for (; *end && (*end != sep); end++)
1244 ; /* Point to end of component */
1245 strlen = end - str;
1246 if (strlen) {
1247 if ((*buflen -= ((XDR_QUADLEN(strlen) << 2) + 4)) < 0)
1248 return nfserr_resource;
1249 WRITE32(strlen);
1250 WRITEMEM(str, strlen);
1251 count++;
1252 }
1253 else
1254 end++;
1255 str = end;
1256 }
1257 *pp = p;
1258 p = countp;
1259 WRITE32(count);
1260 return 0;
1261}
1262
1263/*
1264 * encode a location element of a fs_locations structure
1265 */
1266static int nfsd4_encode_fs_location4(struct nfsd4_fs_location *location,
1267 u32 **pp, int *buflen)
1268{
1269 int status;
1270 u32 *p = *pp;
1271
1272 status = nfsd4_encode_components(':', location->hosts, &p, buflen);
1273 if (status)
1274 return status;
1275 status = nfsd4_encode_components('/', location->path, &p, buflen);
1276 if (status)
1277 return status;
1278 *pp = p;
1279 return 0;
1280}
1281
1282/*
1283 * Return the path to an export point in the pseudo filesystem namespace
1284 * Returned string is safe to use as long as the caller holds a reference
1285 * to @exp.
1286 */
1287static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp)
1288{
1289 struct svc_fh tmp_fh;
1290 char *path, *rootpath;
1291 int stat;
1292
1293 fh_init(&tmp_fh, NFS4_FHSIZE);
1294 stat = exp_pseudoroot(rqstp->rq_client, &tmp_fh, &rqstp->rq_chandle);
1295 if (stat)
1296 return ERR_PTR(stat);
1297 rootpath = tmp_fh.fh_export->ex_path;
1298
1299 path = exp->ex_path;
1300
1301 if (strncmp(path, rootpath, strlen(rootpath))) {
1302 printk("nfsd: fs_locations failed;"
1303 "%s is not contained in %s\n", path, rootpath);
1304 return ERR_PTR(-EOPNOTSUPP);
1305 }
1306
1307 return path + strlen(rootpath);
1308}
1309
1310/*
1311 * encode a fs_locations structure
1312 */
1313static int nfsd4_encode_fs_locations(struct svc_rqst *rqstp,
1314 struct svc_export *exp,
1315 u32 **pp, int *buflen)
1316{
1317 int status, i;
1318 u32 *p = *pp;
1319 struct nfsd4_fs_locations *fslocs = &exp->ex_fslocs;
1320 char *root = nfsd4_path(rqstp, exp);
1321
1322 if (IS_ERR(root))
1323 return PTR_ERR(root);
1324 status = nfsd4_encode_components('/', root, &p, buflen);
1325 if (status)
1326 return status;
1327 if ((*buflen -= 4) < 0)
1328 return nfserr_resource;
1329 WRITE32(fslocs->locations_count);
1330 for (i=0; i<fslocs->locations_count; i++) {
1331 status = nfsd4_encode_fs_location4(&fslocs->locations[i],
1332 &p, buflen);
1333 if (status)
1334 return status;
1335 }
1336 *pp = p;
1337 return 0;
1338}
1226 1339
1227static u32 nfs4_ftypes[16] = { 1340static u32 nfs4_ftypes[16] = {
1228 NF4BAD, NF4FIFO, NF4CHR, NF4BAD, 1341 NF4BAD, NF4FIFO, NF4CHR, NF4BAD,
@@ -1334,6 +1447,11 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
1334 goto out_nfserr; 1447 goto out_nfserr;
1335 } 1448 }
1336 } 1449 }
1450 if (bmval0 & FATTR4_WORD0_FS_LOCATIONS) {
1451 if (exp->ex_fslocs.locations == NULL) {
1452 bmval0 &= ~FATTR4_WORD0_FS_LOCATIONS;
1453 }
1454 }
1337 if ((buflen -= 16) < 0) 1455 if ((buflen -= 16) < 0)
1338 goto out_resource; 1456 goto out_resource;
1339 1457
@@ -1513,6 +1631,13 @@ out_acl:
1513 goto out_resource; 1631 goto out_resource;
1514 WRITE64((u64) statfs.f_files); 1632 WRITE64((u64) statfs.f_files);
1515 } 1633 }
1634 if (bmval0 & FATTR4_WORD0_FS_LOCATIONS) {
1635 status = nfsd4_encode_fs_locations(rqstp, exp, &p, &buflen);
1636 if (status == nfserr_resource)
1637 goto out_resource;
1638 if (status)
1639 goto out;
1640 }
1516 if (bmval0 & FATTR4_WORD0_HOMOGENEOUS) { 1641 if (bmval0 & FATTR4_WORD0_HOMOGENEOUS) {
1517 if ((buflen -= 4) < 0) 1642 if ((buflen -= 4) < 0)
1518 goto out_resource; 1643 goto out_resource;
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index 259841bb2f6c..8094142d95ea 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -292,7 +292,6 @@ static inline int is_fsid(struct svc_fh *fh, struct knfsd_fh *reffh)
292/* 292/*
293 * The following attributes are currently not supported by the NFSv4 server: 293 * The following attributes are currently not supported by the NFSv4 server:
294 * ARCHIVE (deprecated anyway) 294 * ARCHIVE (deprecated anyway)
295 * FS_LOCATIONS (will be supported eventually)
296 * HIDDEN (unlikely to be supported any time soon) 295 * HIDDEN (unlikely to be supported any time soon)
297 * MIMETYPE (unlikely to be supported any time soon) 296 * MIMETYPE (unlikely to be supported any time soon)
298 * QUOTA_* (will be supported in a forthcoming patch) 297 * QUOTA_* (will be supported in a forthcoming patch)
@@ -308,7 +307,7 @@ static inline int is_fsid(struct svc_fh *fh, struct knfsd_fh *reffh)
308 | FATTR4_WORD0_ACLSUPPORT | FATTR4_WORD0_CANSETTIME | FATTR4_WORD0_CASE_INSENSITIVE \ 307 | FATTR4_WORD0_ACLSUPPORT | FATTR4_WORD0_CANSETTIME | FATTR4_WORD0_CASE_INSENSITIVE \
309 | FATTR4_WORD0_CASE_PRESERVING | FATTR4_WORD0_CHOWN_RESTRICTED \ 308 | FATTR4_WORD0_CASE_PRESERVING | FATTR4_WORD0_CHOWN_RESTRICTED \
310 | FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FILEID | FATTR4_WORD0_FILES_AVAIL \ 309 | FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FILEID | FATTR4_WORD0_FILES_AVAIL \
311 | FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL | FATTR4_WORD0_HOMOGENEOUS \ 310 | FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL | FATTR4_WORD0_FS_LOCATIONS | FATTR4_WORD0_HOMOGENEOUS \
312 | FATTR4_WORD0_MAXFILESIZE | FATTR4_WORD0_MAXLINK | FATTR4_WORD0_MAXNAME \ 311 | FATTR4_WORD0_MAXFILESIZE | FATTR4_WORD0_MAXLINK | FATTR4_WORD0_MAXNAME \
313 | FATTR4_WORD0_MAXREAD | FATTR4_WORD0_MAXWRITE | FATTR4_WORD0_ACL) 312 | FATTR4_WORD0_MAXREAD | FATTR4_WORD0_MAXWRITE | FATTR4_WORD0_ACL)
314 313