Commit d8b26071 authored by NeilBrown's avatar NeilBrown Committed by J. Bruce Fields
Browse files

NFSD: simplify struct nfsfh 



Most of the fields in 'struct knfsd_fh' are 2 levels deep (a union and a
struct) and are accessed using macros like:

 #define fh_FOO fh_base.fh_new.fb_FOO

This patch makes the union and struct anonymous, so that "fh_FOO" can be
a name directly within 'struct knfsd_fh' and the #defines aren't needed.

The file handle as a whole is sometimes accessed as "fh_base" or
"fh_base.fh_pad", neither of which are particularly helpful names.
As the struct holding the filehandle is now anonymous, we
cannot use the name of that, so we union it with 'fh_raw' and use that
where the raw filehandle is needed.  fh_raw also ensure the structure is
large enough for the largest possible filehandle.

fh_raw is a 'char' array, removing any need to cast it for memcpy etc.

SVCFH_fmt() is simplified using the "%ph" printk format.  This
changes the appearance of filehandles in dprintk() debugging, making
them a little more precise.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent c645a883

fs/nfsd/flexfilelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ nfsd4_ff_proc_layoutget(struct inode *inode, const struct svc_fh *fhp, 
		goto out_error;



	fl->fh.size = fhp->fh_handle.fh_size;

	memcpy(fl->fh.data, &fhp->fh_handle.fh_base, fl->fh.size);

	memcpy(fl->fh.data, &fhp->fh_handle.fh_raw, fl->fh.size);



	/* Give whole file layout segments */

	seg->offset = 0;

fs/nfsd/lockd.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp, 
	/* must initialize before using! but maxsize doesn't matter */

	fh_init(&fh,0);

	fh.fh_handle.fh_size = f->size;

	memcpy((char*)&fh.fh_handle.fh_base, f->data, f->size);

	memcpy(&fh.fh_handle.fh_raw, f->data, f->size);

	fh.fh_export = NULL;



	access = (mode == O_WRONLY) ? NFSD_MAY_WRITE : NFSD_MAY_READ;

fs/nfsd/nfs3xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ svcxdr_decode_nfs_fh3(struct xdr_stream *xdr, struct svc_fh *fhp) 
		return false;

	fh_init(fhp, NFS3_FHSIZE);

	fhp->fh_handle.fh_size = size;

	memcpy(&fhp->fh_handle.fh_base, p, size);

	memcpy(&fhp->fh_handle.fh_raw, p, size);



	return true;

}
@@ -131,7 +131,7 @@ svcxdr_encode_nfs_fh3(struct xdr_stream *xdr, const struct svc_fh *fhp) 
	*p++ = cpu_to_be32(size);

	if (size)

		p[XDR_QUADLEN(size) - 1] = 0;

	memcpy(p, &fhp->fh_handle.fh_base, size);

	memcpy(p, &fhp->fh_handle.fh_raw, size);



	return true;

}

fs/nfsd/nfs4callback.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void encode_nfs_fh4(struct xdr_stream *xdr, const struct knfsd_fh *fh) 


	BUG_ON(length > NFS4_FHSIZE);

	p = xdr_reserve_space(xdr, 4 + length);

	xdr_encode_opaque(p, &fh->fh_base, length);

	xdr_encode_opaque(p, &fh->fh_raw, length);

}



/*

fs/nfsd/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 


	fh_put(&cstate->current_fh);

	cstate->current_fh.fh_handle.fh_size = putfh->pf_fhlen;

	memcpy(&cstate->current_fh.fh_handle.fh_base, putfh->pf_fhval,

	memcpy(&cstate->current_fh.fh_handle.fh_raw, putfh->pf_fhval,

	       putfh->pf_fhlen);

	ret = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_BYPASS_GSS);

#ifdef CONFIG_NFSD_V4_2_INTER_SSC
@@ -1383,7 +1383,7 @@ nfsd4_setup_inter_ssc(struct svc_rqst *rqstp, 
	s_fh = &cstate->save_fh;



	copy->c_fh.size = s_fh->fh_handle.fh_size;

	memcpy(copy->c_fh.data, &s_fh->fh_handle.fh_base, copy->c_fh.size);

	memcpy(copy->c_fh.data, &s_fh->fh_handle.fh_raw, copy->c_fh.size);

	copy->stateid.seqid = cpu_to_be32(s_stid->si_generation);

	memcpy(copy->stateid.other, (void *)&s_stid->si_opaque,

	       sizeof(stateid_opaque_t));