Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 22:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

NFSD: Deprecate NFS_OFFSET_MAX

Browse Source 
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: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2022-01-25 15:57:45 -05:00
parent 6a4d333d54
commit c306d73769
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/nfs3xdr.c
View File

@ -1060,7 +1060,7 @@ svcxdr_encode_entry3_common(struct nfsd3_readdirres *resp, const char *name,
return false; return false;
/* cookie */ /* cookie */
resp->cookie_offset = dirlist->len; 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 false;
return true; return true;

2
fs/nfsd/nfs4xdr.c
View File

@ -3495,7 +3495,7 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen,
p = xdr_reserve_space(xdr, 3*4 + namlen); p = xdr_reserve_space(xdr, 3*4 + namlen);
if (!p) if (!p)
goto fail; 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 */ p = xdr_encode_array(p, name, namlen); /* name length & name */
nfserr = nfsd4_encode_dirent_fattr(xdr, cd, name, namlen); nfserr = nfsd4_encode_dirent_fattr(xdr, cd, name, namlen);

8
include/linux/nfs.h
View File

@ -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); 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 { enum nfs3_stable_how {
NFS_UNSTABLE = 0, NFS_UNSTABLE = 0,
NFS_DATA_SYNC = 1, NFS_DATA_SYNC = 1,