Commit c306d737 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Deprecate NFS_OFFSET_MAX 



NFS_OFFSET_MAX was introduced way back in Linux v2.3.y before there
was a kernel-wide OFFSET_MAX value. As a clean up, replace the last
few uses of it with its generic equivalent, and get rid of it.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 6a4d333d

fs/nfsd/nfs3xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ svcxdr_encode_entry3_common(struct nfsd3_readdirres *resp, const char *name, 
		return false;

	/* cookie */

	resp->cookie_offset = dirlist->len;

	if (xdr_stream_encode_u64(xdr, NFS_OFFSET_MAX) < 0)

	if (xdr_stream_encode_u64(xdr, OFFSET_MAX) < 0)

		return false;



	return true;

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -3495,7 +3495,7 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, 
	p = xdr_reserve_space(xdr, 3*4 + namlen);

	if (!p)

		goto fail;

	p = xdr_encode_hyper(p, NFS_OFFSET_MAX);    /* offset of next entry */

	p = xdr_encode_hyper(p, OFFSET_MAX);        /* offset of next entry */

	p = xdr_encode_array(p, name, namlen);      /* name length & name */



	nfserr = nfsd4_encode_dirent_fattr(xdr, cd, name, namlen);

include/linux/nfs.h

+0 −8
Original line number Diff line number Diff line
@@ -36,14 +36,6 @@ static inline void nfs_copy_fh(struct nfs_fh *target, const struct nfs_fh *sourc 
	memcpy(target->data, source->data, source->size);

}





/*

 * This is really a general kernel constant, but since nothing like

 * this is defined in the kernel headers, I have to do it here.

 */

#define NFS_OFFSET_MAX		((__s64)((~(__u64)0) >> 1))





enum nfs3_stable_how {

	NFS_UNSTABLE = 0,

	NFS_DATA_SYNC = 1,