[PATCH] large dev_t - second series (14/15)

	nfs_fattr->rdev switched to dev_t; code that unpacks on-the-wire
attributes does explicit conversion now.

diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index 1461252f66fe113cad38da99c5bcaabb70efedc8..d5f552dd7f4eb560067b9edb8bbb23477cffe362 100644 (file)
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -106,6 +106,7 @@ xdr_decode_time(u32 *p, struct timespec *timep)
 static u32 *
 xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr)
 {
+       u32 rdev;
        fattr->type = (enum nfs_ftype) ntohl(*p++);
        fattr->mode = ntohl(*p++);
        fattr->nlink = ntohl(*p++);
@@ -113,7 +114,7 @@ xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr)
        fattr->gid = ntohl(*p++);
        fattr->size = ntohl(*p++);
        fattr->du.nfs2.blocksize = ntohl(*p++);
-       fattr->rdev = ntohl(*p++);
+       rdev = ntohl(*p++);
        fattr->du.nfs2.blocks = ntohl(*p++);
        fattr->fsid_u.nfs3 = ntohl(*p++);
        fattr->fileid = ntohl(*p++);
@@ -121,7 +122,8 @@ xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr)
        p = xdr_decode_time(p, &fattr->mtime);
        p = xdr_decode_time(p, &fattr->ctime);
        fattr->valid |= NFS_ATTR_FATTR;
-       if (fattr->type == NFCHR && fattr->rdev == NFS2_FIFO_DEV) {
+       fattr->rdev = old_decode_dev(rdev);
+       if (fattr->type == NFCHR && rdev == NFS2_FIFO_DEV) {
                fattr->type = NFFIFO;
                fattr->mode = (fattr->mode & ~S_IFMT) | S_IFIFO;
                fattr->rdev = 0;

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 3d46a2caaade94222f267edf28256a79b1bac52d..88b705d8cefec517ba65b9bde919a070c951ff8d 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -23,7 +23,7 @@ struct nfs_fattr {
                        __u64   used;
                } nfs3;
        } du;
-       __u32                   rdev;
+       dev_t                   rdev;
        union {
                __u64           nfs3;           /* also nfs2 */
                struct {