microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

nfs: nfs4xdr: get rid of READ64 

s/READ64\(\*(.*)\)/p = xdr_decode_hyper(p, \1)/
s/READ64\((.*)\)/p = xdr_decode_hyper(p, &\1)/

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Benny Halevy 2009-08-14 17:19:41 +03:00 коммит произвёл Trond Myklebust
Родитель 6f723f7710
Коммит 3ceb4dbb99
1 изменённых файлов: 25 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

54
fs/nfs/nfs4xdr.c
Просмотреть файл

@ -2433,10 +2433,6 @@ static int nfs4_xdr_enc_get_lease_time(struct rpc_rqst *req, uint32_t *p,
* task to translate them into Linux-specific versions which are more * task to translate them into Linux-specific versions which are more
* consistent with the style used in NFSv2/v3... * consistent with the style used in NFSv2/v3...
*/ */
#define READ64(x) do { \
(x) = (u64)ntohl(*p++) << 32; \
(x) |= ntohl(*p++); \
} while (0)
#define READTIME(x) do { \ #define READTIME(x) do { \
p++; \ p++; \
(x.tv_sec) = ntohl(*p++); \ (x.tv_sec) = ntohl(*p++); \
@ -2588,7 +2584,7 @@ static int decode_attr_change(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t
return -EIO; return -EIO;
if (likely(bitmap[0] & FATTR4_WORD0_CHANGE)) { if (likely(bitmap[0] & FATTR4_WORD0_CHANGE)) {
READ_BUF(8); READ_BUF(8);
READ64(*change); p = xdr_decode_hyper(p, change);
bitmap[0] &= ~FATTR4_WORD0_CHANGE; bitmap[0] &= ~FATTR4_WORD0_CHANGE;
ret = NFS_ATTR_FATTR_CHANGE; ret = NFS_ATTR_FATTR_CHANGE;
} }
@ -2607,7 +2603,7 @@ static int decode_attr_size(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *
return -EIO; return -EIO;
if (likely(bitmap[0] & FATTR4_WORD0_SIZE)) { if (likely(bitmap[0] & FATTR4_WORD0_SIZE)) {
READ_BUF(8); READ_BUF(8);
READ64(*size); p = xdr_decode_hyper(p, size);
bitmap[0] &= ~FATTR4_WORD0_SIZE; bitmap[0] &= ~FATTR4_WORD0_SIZE;
ret = NFS_ATTR_FATTR_SIZE; ret = NFS_ATTR_FATTR_SIZE;
} }
@ -2658,8 +2654,8 @@ static int decode_attr_fsid(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs
return -EIO; return -EIO;
if (likely(bitmap[0] & FATTR4_WORD0_FSID)) { if (likely(bitmap[0] & FATTR4_WORD0_FSID)) {
READ_BUF(16); READ_BUF(16);
READ64(fsid->major); p = xdr_decode_hyper(p, &fsid->major);
READ64(fsid->minor); p = xdr_decode_hyper(p, &fsid->minor);
bitmap[0] &= ~FATTR4_WORD0_FSID; bitmap[0] &= ~FATTR4_WORD0_FSID;
ret = NFS_ATTR_FATTR_FSID; ret = NFS_ATTR_FATTR_FSID;
} }
@ -2711,7 +2707,7 @@ static int decode_attr_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t
return -EIO; return -EIO;
if (likely(bitmap[0] & FATTR4_WORD0_FILEID)) { if (likely(bitmap[0] & FATTR4_WORD0_FILEID)) {
READ_BUF(8); READ_BUF(8);
READ64(*fileid); p = xdr_decode_hyper(p, fileid);
bitmap[0] &= ~FATTR4_WORD0_FILEID; bitmap[0] &= ~FATTR4_WORD0_FILEID;
ret = NFS_ATTR_FATTR_FILEID; ret = NFS_ATTR_FATTR_FILEID;
} }
@ -2729,7 +2725,7 @@ static int decode_attr_mounted_on_fileid(struct xdr_stream *xdr, uint32_t *bitma
return -EIO; return -EIO;
if (likely(bitmap[1] & FATTR4_WORD1_MOUNTED_ON_FILEID)) { if (likely(bitmap[1] & FATTR4_WORD1_MOUNTED_ON_FILEID)) {
READ_BUF(8); READ_BUF(8);
READ64(*fileid); p = xdr_decode_hyper(p, fileid);
bitmap[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID; bitmap[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID;
ret = NFS_ATTR_FATTR_FILEID; ret = NFS_ATTR_FATTR_FILEID;
} }
@ -2747,7 +2743,7 @@ static int decode_attr_files_avail(struct xdr_stream *xdr, uint32_t *bitmap, uin
return -EIO; return -EIO;
if (likely(bitmap[0] & FATTR4_WORD0_FILES_AVAIL)) { if (likely(bitmap[0] & FATTR4_WORD0_FILES_AVAIL)) {
READ_BUF(8); READ_BUF(8);
READ64(*res); p = xdr_decode_hyper(p, res);
bitmap[0] &= ~FATTR4_WORD0_FILES_AVAIL; bitmap[0] &= ~FATTR4_WORD0_FILES_AVAIL;
} }
dprintk("%s: files avail=%Lu\n", __func__, (unsigned long long)*res); dprintk("%s: files avail=%Lu\n", __func__, (unsigned long long)*res);
@ -2764,7 +2760,7 @@ static int decode_attr_files_free(struct xdr_stream *xdr, uint32_t *bitmap, uint
return -EIO; return -EIO;
if (likely(bitmap[0] & FATTR4_WORD0_FILES_FREE)) { if (likely(bitmap[0] & FATTR4_WORD0_FILES_FREE)) {
READ_BUF(8); READ_BUF(8);
READ64(*res); p = xdr_decode_hyper(p, res);
bitmap[0] &= ~FATTR4_WORD0_FILES_FREE; bitmap[0] &= ~FATTR4_WORD0_FILES_FREE;
} }
dprintk("%s: files free=%Lu\n", __func__, (unsigned long long)*res); dprintk("%s: files free=%Lu\n", __func__, (unsigned long long)*res);
@ -2781,7 +2777,7 @@ static int decode_attr_files_total(struct xdr_stream *xdr, uint32_t *bitmap, uin
return -EIO; return -EIO;
if (likely(bitmap[0] & FATTR4_WORD0_FILES_TOTAL)) { if (likely(bitmap[0] & FATTR4_WORD0_FILES_TOTAL)) {
READ_BUF(8); READ_BUF(8);
READ64(*res); p = xdr_decode_hyper(p, res);
bitmap[0] &= ~FATTR4_WORD0_FILES_TOTAL; bitmap[0] &= ~FATTR4_WORD0_FILES_TOTAL;
} }
dprintk("%s: files total=%Lu\n", __func__, (unsigned long long)*res); dprintk("%s: files total=%Lu\n", __func__, (unsigned long long)*res);
@ -2910,7 +2906,7 @@ static int decode_attr_maxfilesize(struct xdr_stream *xdr, uint32_t *bitmap, uin
return -EIO; return -EIO;
if (likely(bitmap[0] & FATTR4_WORD0_MAXFILESIZE)) { if (likely(bitmap[0] & FATTR4_WORD0_MAXFILESIZE)) {
READ_BUF(8); READ_BUF(8);
READ64(*res); p = xdr_decode_hyper(p, res);
bitmap[0] &= ~FATTR4_WORD0_MAXFILESIZE; bitmap[0] &= ~FATTR4_WORD0_MAXFILESIZE;
} }
dprintk("%s: maxfilesize=%Lu\n", __func__, (unsigned long long)*res); dprintk("%s: maxfilesize=%Lu\n", __func__, (unsigned long long)*res);
@ -2962,7 +2958,7 @@ static int decode_attr_maxread(struct xdr_stream *xdr, uint32_t *bitmap, uint32_
if (likely(bitmap[0] & FATTR4_WORD0_MAXREAD)) { if (likely(bitmap[0] & FATTR4_WORD0_MAXREAD)) {
uint64_t maxread; uint64_t maxread;
READ_BUF(8); READ_BUF(8);
READ64(maxread); p = xdr_decode_hyper(p, &maxread);
if (maxread > 0x7FFFFFFF) if (maxread > 0x7FFFFFFF)
maxread = 0x7FFFFFFF; maxread = 0x7FFFFFFF;
*res = (uint32_t)maxread; *res = (uint32_t)maxread;
@ -2983,7 +2979,7 @@ static int decode_attr_maxwrite(struct xdr_stream *xdr, uint32_t *bitmap, uint32
if (likely(bitmap[0] & FATTR4_WORD0_MAXWRITE)) { if (likely(bitmap[0] & FATTR4_WORD0_MAXWRITE)) {
uint64_t maxwrite; uint64_t maxwrite;
READ_BUF(8); READ_BUF(8);
READ64(maxwrite); p = xdr_decode_hyper(p, &maxwrite);
if (maxwrite > 0x7FFFFFFF) if (maxwrite > 0x7FFFFFFF)
maxwrite = 0x7FFFFFFF; maxwrite = 0x7FFFFFFF;
*res = (uint32_t)maxwrite; *res = (uint32_t)maxwrite;
@ -3122,7 +3118,7 @@ static int decode_attr_space_avail(struct xdr_stream *xdr, uint32_t *bitmap, uin
return -EIO; return -EIO;
if (likely(bitmap[1] & FATTR4_WORD1_SPACE_AVAIL)) { if (likely(bitmap[1] & FATTR4_WORD1_SPACE_AVAIL)) {
READ_BUF(8); READ_BUF(8);
READ64(*res); p = xdr_decode_hyper(p, res);
bitmap[1] &= ~FATTR4_WORD1_SPACE_AVAIL; bitmap[1] &= ~FATTR4_WORD1_SPACE_AVAIL;
} }
dprintk("%s: space avail=%Lu\n", __func__, (unsigned long long)*res); dprintk("%s: space avail=%Lu\n", __func__, (unsigned long long)*res);
@ -3139,7 +3135,7 @@ static int decode_attr_space_free(struct xdr_stream *xdr, uint32_t *bitmap, uint
return -EIO; return -EIO;
if (likely(bitmap[1] & FATTR4_WORD1_SPACE_FREE)) { if (likely(bitmap[1] & FATTR4_WORD1_SPACE_FREE)) {
READ_BUF(8); READ_BUF(8);
READ64(*res); p = xdr_decode_hyper(p, res);
bitmap[1] &= ~FATTR4_WORD1_SPACE_FREE; bitmap[1] &= ~FATTR4_WORD1_SPACE_FREE;
} }
dprintk("%s: space free=%Lu\n", __func__, (unsigned long long)*res); dprintk("%s: space free=%Lu\n", __func__, (unsigned long long)*res);
@ -3156,7 +3152,7 @@ static int decode_attr_space_total(struct xdr_stream *xdr, uint32_t *bitmap, uin
return -EIO; return -EIO;
if (likely(bitmap[1] & FATTR4_WORD1_SPACE_TOTAL)) { if (likely(bitmap[1] & FATTR4_WORD1_SPACE_TOTAL)) {
READ_BUF(8); READ_BUF(8);
READ64(*res); p = xdr_decode_hyper(p, res);
bitmap[1] &= ~FATTR4_WORD1_SPACE_TOTAL; bitmap[1] &= ~FATTR4_WORD1_SPACE_TOTAL;
} }
dprintk("%s: space total=%Lu\n", __func__, (unsigned long long)*res); dprintk("%s: space total=%Lu\n", __func__, (unsigned long long)*res);
@ -3173,7 +3169,7 @@ static int decode_attr_space_used(struct xdr_stream *xdr, uint32_t *bitmap, uint
return -EIO; return -EIO;
if (likely(bitmap[1] & FATTR4_WORD1_SPACE_USED)) { if (likely(bitmap[1] & FATTR4_WORD1_SPACE_USED)) {
READ_BUF(8); READ_BUF(8);
READ64(*used); p = xdr_decode_hyper(p, used);
bitmap[1] &= ~FATTR4_WORD1_SPACE_USED; bitmap[1] &= ~FATTR4_WORD1_SPACE_USED;
ret = NFS_ATTR_FATTR_SPACE_USED; ret = NFS_ATTR_FATTR_SPACE_USED;
} }
@ -3189,7 +3185,7 @@ static int decode_attr_time(struct xdr_stream *xdr, struct timespec *time)
uint32_t nsec; uint32_t nsec;
READ_BUF(12); READ_BUF(12);
READ64(sec); p = xdr_decode_hyper(p, &sec);
nsec = be32_to_cpup(p++); nsec = be32_to_cpup(p++);
time->tv_sec = (time_t)sec; time->tv_sec = (time_t)sec;
time->tv_nsec = (long)nsec; time->tv_nsec = (long)nsec;
@ -3273,8 +3269,8 @@ static int decode_change_info(struct xdr_stream *xdr, struct nfs4_change_info *c
READ_BUF(20); READ_BUF(20);
cinfo->atomic = be32_to_cpup(p++); cinfo->atomic = be32_to_cpup(p++);
READ64(cinfo->before); p = xdr_decode_hyper(p, &cinfo->before);
READ64(cinfo->after); p = xdr_decode_hyper(p, &cinfo->after);
return 0; return 0;
} }
@ -3619,8 +3615,8 @@ static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl)
uint32_t namelen, type; uint32_t namelen, type;
READ_BUF(32); READ_BUF(32);
READ64(offset); p = xdr_decode_hyper(p, &offset);
READ64(length); p = xdr_decode_hyper(p, &length);
type = be32_to_cpup(p++); type = be32_to_cpup(p++);
if (fl != NULL) { if (fl != NULL) {
fl->fl_start = (loff_t)offset; fl->fl_start = (loff_t)offset;
@ -3632,7 +3628,7 @@ static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl)
fl->fl_type = F_RDLCK; fl->fl_type = F_RDLCK;
fl->fl_pid = 0; fl->fl_pid = 0;
} }
READ64(clientid); p = xdr_decode_hyper(p, &clientid);
namelen = be32_to_cpup(p++); namelen = be32_to_cpup(p++);
READ_BUF(namelen); READ_BUF(namelen);
return -NFS4ERR_DENIED; return -NFS4ERR_DENIED;
@ -3697,7 +3693,7 @@ static int decode_space_limit(struct xdr_stream *xdr, u64 *maxsize)
limit_type = be32_to_cpup(p++); limit_type = be32_to_cpup(p++);
switch (limit_type) { switch (limit_type) {
case 1: case 1:
READ64(*maxsize); p = xdr_decode_hyper(p, maxsize);
break; break;
case 2: case 2:
nblocks = be32_to_cpup(p++); nblocks = be32_to_cpup(p++);
@ -4090,7 +4086,7 @@ static int decode_setclientid(struct xdr_stream *xdr, struct nfs_client *clp)
nfserr = be32_to_cpup(p++); nfserr = be32_to_cpup(p++);
if (nfserr == NFS_OK) { if (nfserr == NFS_OK) {
READ_BUF(8 + NFS4_VERIFIER_SIZE); READ_BUF(8 + NFS4_VERIFIER_SIZE);
READ64(clp->cl_clientid); p = xdr_decode_hyper(p, &clp->cl_clientid);
COPYMEM(clp->cl_confirm.data, NFS4_VERIFIER_SIZE); COPYMEM(clp->cl_confirm.data, NFS4_VERIFIER_SIZE);
} else if (nfserr == NFSERR_CLID_INUSE) { } else if (nfserr == NFSERR_CLID_INUSE) {
uint32_t len; uint32_t len;
@ -4151,7 +4147,7 @@ static int decode_exchange_id(struct xdr_stream *xdr,
return status; return status;
READ_BUF(8); READ_BUF(8);
READ64(clp->cl_ex_clid); p = xdr_decode_hyper(p, &clp->cl_ex_clid);
READ_BUF(12); READ_BUF(12);
clp->cl_seqid = be32_to_cpup(p++); clp->cl_seqid = be32_to_cpup(p++);
clp->cl_exchange_flags = be32_to_cpup(p++); clp->cl_exchange_flags = be32_to_cpup(p++);