2003-02-11 10:05:30

by Andries E. Brouwer

Subject: [PATCH] nfs fix

nfs must not use MINORBITS - that fails with 32-bit dev_t

diff -u --recursive --new-file -X /linux/dontdiff a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
--- a/fs/nfs/nfs3xdr.c Wed Jan 1 23:54:24 2003
+++ b/fs/nfs/nfs3xdr.c Sun Feb 2 00:57:47 2003
@@ -146,7 +146,7 @@
static u32 *
xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr)
{
- unsigned int type;
+ unsigned int type, major, minor;
int fmode;

type = ntohl(*p++);
@@ -160,9 +160,12 @@
fattr->gid = ntohl(*p++);
p = xdr_decode_hyper(p, &fattr->size);
p = xdr_decode_hyper(p, &fattr->du.nfs3.used);
+
/* Turn remote device info into Linux-specific dev_t */
- fattr->rdev = ntohl(*p++) << MINORBITS;
- fattr->rdev |= ntohl(*p++) & MINORMASK;
+ major = ntohl(*p++);
+ minor = ntohl(*p++);
+ fattr->rdev = MKDEV(major, minor);
+
p = xdr_decode_hyper(p, &fattr->fsid_u.nfs3);
p = xdr_decode_hyper(p, &fattr->fileid);
p = xdr_decode_time3(p, &fattr->atime);
@@ -412,8 +415,8 @@
*p++ = htonl(args->type);
p = xdr_encode_sattr(p, args->sattr);
if (args->type == NF3CHR || args->type == NF3BLK) {
- *p++ = htonl(args->rdev >> MINORBITS);
- *p++ = htonl(args->rdev & MINORMASK);
+ *p++ = htonl(MAJOR(args->rdev));
+ *p++ = htonl(MINOR(args->rdev));
}

req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
diff -u --recursive --new-file -X /linux/dontdiff a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
--- a/fs/nfs/nfs4xdr.c Thu Jan 9 18:07:16 2003
+++ b/fs/nfs/nfs4xdr.c Sun Feb 2 00:55:22 2003
@@ -1385,13 +1385,14 @@
dprintk("read_attrs: gid=%d\n", (int)nfp->gid);
}
if (bmval1 & FATTR4_WORD1_RAWDEV) {
- READ_BUF(8);
- len += 8;
- READ32(dummy32);
- nfp->rdev = (dummy32 << MINORBITS);
- READ32(dummy32);
- nfp->rdev |= (dummy32 & MINORMASK);
- dprintk("read_attrs: rdev=%d\n", nfp->rdev);
+ uint32_t major, minor;
+
+ READ_BUF(8);
+ len += 8;
+ READ32(major);
+ READ32(minor);
+ nfp->rdev = MKDEV(major, minor);
+ dprintk("read_attrs: rdev=0x%x\n", nfp->rdev);
}
if (bmval1 & FATTR4_WORD1_SPACE_AVAIL) {
READ_BUF(8);