aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorManoj Naik <manoj@almaden.ibm.com>2006-06-09 09:34:25 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-09 09:34:25 -0400
commit830b8e33fe1900b87c8eb7ec5c646117a9f298d6 (patch)
tree8e4aa4c7ecd0485a288254433edf76305852c846 /fs/nfs
parent361e624f6d8bfbeac53769603d995d47535cfd46 (diff)
NFSv4: Define an fs_locations bitmap
This is (similar to getattr bitmap) but includes fs_locations and mounted_on_fileid attributes. Use this bitmap for encoding in fs_locations requests. Note: We can probably do better by requesting locations as part of fsinfo itself. Signed-off-by: Manoj Naik <manoj@almaden.ibm.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4_fs.h1
-rw-r--r--fs/nfs/nfs4proc.c20
-rw-r--r--fs/nfs/nfs4xdr.c11
3 files changed, 30 insertions, 2 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 22a5f838ea58..9a102860df37 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -228,6 +228,7 @@ extern const u32 nfs4_fattr_bitmap[2];
228extern const u32 nfs4_statfs_bitmap[2]; 228extern const u32 nfs4_statfs_bitmap[2];
229extern const u32 nfs4_pathconf_bitmap[2]; 229extern const u32 nfs4_pathconf_bitmap[2];
230extern const u32 nfs4_fsinfo_bitmap[2]; 230extern const u32 nfs4_fsinfo_bitmap[2];
231extern const u32 nfs4_fs_locations_bitmap[2];
231 232
232/* nfs4renewd.c */ 233/* nfs4renewd.c */
233extern void nfs4_schedule_state_renewal(struct nfs4_client *); 234extern void nfs4_schedule_state_renewal(struct nfs4_client *);
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 8640607d6a00..90ee21a07b3e 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -121,6 +121,25 @@ const u32 nfs4_fsinfo_bitmap[2] = { FATTR4_WORD0_MAXFILESIZE
121 0 121 0
122}; 122};
123 123
124const u32 nfs4_fs_locations_bitmap[2] = {
125 FATTR4_WORD0_TYPE
126 | FATTR4_WORD0_CHANGE
127 | FATTR4_WORD0_SIZE
128 | FATTR4_WORD0_FSID
129 | FATTR4_WORD0_FILEID
130 | FATTR4_WORD0_FS_LOCATIONS,
131 FATTR4_WORD1_MODE
132 | FATTR4_WORD1_NUMLINKS
133 | FATTR4_WORD1_OWNER
134 | FATTR4_WORD1_OWNER_GROUP
135 | FATTR4_WORD1_RAWDEV
136 | FATTR4_WORD1_SPACE_USED
137 | FATTR4_WORD1_TIME_ACCESS
138 | FATTR4_WORD1_TIME_METADATA
139 | FATTR4_WORD1_TIME_MODIFY
140 | FATTR4_WORD1_MOUNTED_ON_FILEID
141};
142
124static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry, 143static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry,
125 struct nfs4_readdir_arg *readdir) 144 struct nfs4_readdir_arg *readdir)
126{ 145{
@@ -3594,6 +3613,7 @@ int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry,
3594 dprintk("%s: start\n", __FUNCTION__); 3613 dprintk("%s: start\n", __FUNCTION__);
3595 fs_locations->fattr.valid = 0; 3614 fs_locations->fattr.valid = 0;
3596 fs_locations->server = server; 3615 fs_locations->server = server;
3616 fs_locations->nlocations = 0;
3597 status = rpc_call_sync(server->client, &msg, 0); 3617 status = rpc_call_sync(server->client, &msg, 0);
3598 dprintk("%s: returned status = %d\n", __FUNCTION__, status); 3618 dprintk("%s: returned status = %d\n", __FUNCTION__, status);
3599 return status; 3619 return status;
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 4b6613f61341..646f16da0722 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -731,6 +731,13 @@ static int encode_fsinfo(struct xdr_stream *xdr, const u32* bitmask)
731 bitmask[1] & nfs4_fsinfo_bitmap[1]); 731 bitmask[1] & nfs4_fsinfo_bitmap[1]);
732} 732}
733 733
734static int encode_fs_locations(struct xdr_stream *xdr, const u32* bitmask)
735{
736 return encode_getattr_two(xdr,
737 bitmask[0] & nfs4_fs_locations_bitmap[0],
738 bitmask[1] & nfs4_fs_locations_bitmap[1]);
739}
740
734static int encode_getfh(struct xdr_stream *xdr) 741static int encode_getfh(struct xdr_stream *xdr)
735{ 742{
736 uint32_t *p; 743 uint32_t *p;
@@ -2030,10 +2037,10 @@ static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, uint32_t *p, struct n
2030 goto out; 2037 goto out;
2031 if ((status = encode_lookup(&xdr, args->name)) != 0) 2038 if ((status = encode_lookup(&xdr, args->name)) != 0)
2032 goto out; 2039 goto out;
2033 if ((status = encode_getfattr(&xdr, args->bitmask)) != 0) 2040 if ((status = encode_fs_locations(&xdr, args->bitmask)) != 0)
2034 goto out; 2041 goto out;
2035 /* set up reply 2042 /* set up reply
2036 * toplevel_status + taglen + rescount + OP_PUTFH + status 2043 * toplevel_status + OP_PUTFH + status
2037 * + OP_LOOKUP + status + OP_GETATTR + status = 7 2044 * + OP_LOOKUP + status + OP_GETATTR + status = 7
2038 */ 2045 */
2039 replen = (RPC_REPHDRSIZE + auth->au_rslack + 7) << 2; 2046 replen = (RPC_REPHDRSIZE + auth->au_rslack + 7) << 2;