Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 830b8e33 authored by Manoj Naik's avatar Manoj Naik Committed by Trond Myklebust
Browse files

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: default avatarManoj Naik <manoj@almaden.ibm.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 361e624f

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ extern const u32 nfs4_fattr_bitmap[2]; 
extern const u32 nfs4_statfs_bitmap[2];

extern const u32 nfs4_pathconf_bitmap[2];

extern const u32 nfs4_fsinfo_bitmap[2];

extern const u32 nfs4_fs_locations_bitmap[2];



/* nfs4renewd.c */

extern void nfs4_schedule_state_renewal(struct nfs4_client *);

fs/nfs/nfs4proc.c

+20 −0
Original line number Diff line number Diff line
@@ -121,6 +121,25 @@ const u32 nfs4_fsinfo_bitmap[2] = { FATTR4_WORD0_MAXFILESIZE 
			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,

		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__);

	fs_locations->fattr.valid = 0;

	fs_locations->server = server;

	fs_locations->nlocations = 0;

	status = rpc_call_sync(server->client, &msg, 0);

	dprintk("%s: returned status = %d\n", __FUNCTION__, status);

	return status;

fs/nfs/nfs4xdr.c

+9 −2
Original line number Diff line number Diff line
@@ -731,6 +731,13 @@ static int encode_fsinfo(struct xdr_stream *xdr, const u32* bitmask) 
			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)

{

	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;

	if ((status = encode_lookup(&xdr, args->name)) != 0)

		goto out;

	if ((status = encode_getfattr(&xdr, args->bitmask)) != 0)

	if ((status = encode_fs_locations(&xdr, args->bitmask)) != 0)

		goto out;

	/* set up reply

	 *   toplevel_status + taglen + rescount + OP_PUTFH + status

	 *   toplevel_status + OP_PUTFH + status

	 *   + OP_LOOKUP + status + OP_GETATTR + status = 7

	 */

	replen = (RPC_REPHDRSIZE + auth->au_rslack + 7) << 2;