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>
This commit is contained in:
parent
361e624f6d
commit
830b8e33fe
|
@ -228,6 +228,7 @@ extern const u32 nfs4_fattr_bitmap[2];
|
||||||
extern const u32 nfs4_statfs_bitmap[2];
|
extern const u32 nfs4_statfs_bitmap[2];
|
||||||
extern const u32 nfs4_pathconf_bitmap[2];
|
extern const u32 nfs4_pathconf_bitmap[2];
|
||||||
extern const u32 nfs4_fsinfo_bitmap[2];
|
extern const u32 nfs4_fsinfo_bitmap[2];
|
||||||
|
extern const u32 nfs4_fs_locations_bitmap[2];
|
||||||
|
|
||||||
/* nfs4renewd.c */
|
/* nfs4renewd.c */
|
||||||
extern void nfs4_schedule_state_renewal(struct nfs4_client *);
|
extern void nfs4_schedule_state_renewal(struct nfs4_client *);
|
||||||
|
|
|
@ -121,6 +121,25 @@ const u32 nfs4_fsinfo_bitmap[2] = { FATTR4_WORD0_MAXFILESIZE
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const u32 nfs4_fs_locations_bitmap[2] = {
|
||||||
|
FATTR4_WORD0_TYPE
|
||||||
|
| FATTR4_WORD0_CHANGE
|
||||||
|
| FATTR4_WORD0_SIZE
|
||||||
|
| FATTR4_WORD0_FSID
|
||||||
|
| FATTR4_WORD0_FILEID
|
||||||
|
| FATTR4_WORD0_FS_LOCATIONS,
|
||||||
|
FATTR4_WORD1_MODE
|
||||||
|
| FATTR4_WORD1_NUMLINKS
|
||||||
|
| FATTR4_WORD1_OWNER
|
||||||
|
| FATTR4_WORD1_OWNER_GROUP
|
||||||
|
| FATTR4_WORD1_RAWDEV
|
||||||
|
| FATTR4_WORD1_SPACE_USED
|
||||||
|
| FATTR4_WORD1_TIME_ACCESS
|
||||||
|
| FATTR4_WORD1_TIME_METADATA
|
||||||
|
| FATTR4_WORD1_TIME_MODIFY
|
||||||
|
| FATTR4_WORD1_MOUNTED_ON_FILEID
|
||||||
|
};
|
||||||
|
|
||||||
static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry,
|
static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry,
|
||||||
struct nfs4_readdir_arg *readdir)
|
struct nfs4_readdir_arg *readdir)
|
||||||
{
|
{
|
||||||
|
@ -3594,6 +3613,7 @@ int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry,
|
||||||
dprintk("%s: start\n", __FUNCTION__);
|
dprintk("%s: start\n", __FUNCTION__);
|
||||||
fs_locations->fattr.valid = 0;
|
fs_locations->fattr.valid = 0;
|
||||||
fs_locations->server = server;
|
fs_locations->server = server;
|
||||||
|
fs_locations->nlocations = 0;
|
||||||
status = rpc_call_sync(server->client, &msg, 0);
|
status = rpc_call_sync(server->client, &msg, 0);
|
||||||
dprintk("%s: returned status = %d\n", __FUNCTION__, status);
|
dprintk("%s: returned status = %d\n", __FUNCTION__, status);
|
||||||
return status;
|
return status;
|
||||||
|
|
|
@ -731,6 +731,13 @@ static int encode_fsinfo(struct xdr_stream *xdr, const u32* bitmask)
|
||||||
bitmask[1] & nfs4_fsinfo_bitmap[1]);
|
bitmask[1] & nfs4_fsinfo_bitmap[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int encode_fs_locations(struct xdr_stream *xdr, const u32* bitmask)
|
||||||
|
{
|
||||||
|
return encode_getattr_two(xdr,
|
||||||
|
bitmask[0] & nfs4_fs_locations_bitmap[0],
|
||||||
|
bitmask[1] & nfs4_fs_locations_bitmap[1]);
|
||||||
|
}
|
||||||
|
|
||||||
static int encode_getfh(struct xdr_stream *xdr)
|
static int encode_getfh(struct xdr_stream *xdr)
|
||||||
{
|
{
|
||||||
uint32_t *p;
|
uint32_t *p;
|
||||||
|
@ -2030,10 +2037,10 @@ static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, uint32_t *p, struct n
|
||||||
goto out;
|
goto out;
|
||||||
if ((status = encode_lookup(&xdr, args->name)) != 0)
|
if ((status = encode_lookup(&xdr, args->name)) != 0)
|
||||||
goto out;
|
goto out;
|
||||||
if ((status = encode_getfattr(&xdr, args->bitmask)) != 0)
|
if ((status = encode_fs_locations(&xdr, args->bitmask)) != 0)
|
||||||
goto out;
|
goto out;
|
||||||
/* set up reply
|
/* set up reply
|
||||||
* toplevel_status + taglen + rescount + OP_PUTFH + status
|
* toplevel_status + OP_PUTFH + status
|
||||||
* + OP_LOOKUP + status + OP_GETATTR + status = 7
|
* + OP_LOOKUP + status + OP_GETATTR + status = 7
|
||||||
*/
|
*/
|
||||||
replen = (RPC_REPHDRSIZE + auth->au_rslack + 7) << 2;
|
replen = (RPC_REPHDRSIZE + auth->au_rslack + 7) << 2;
|
||||||
|
|
Loading…
Reference in a new issue