Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bca79478 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Fix the type of struct nfs_fattr->mode 



There is no point in using anything other than umode_t, since we copy the
content pretty much directly into inode->i_mode.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 1ca277d8

fs/nfs/getroot.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ int nfs4_path_walk(struct nfs_server *server, 
		return ret;

	}



	if (fattr.type != NFDIR) {

	if (!S_ISDIR(fattr.mode)) {

		printk(KERN_ERR "nfs4_get_root:"

		       " getroot encountered non-directory\n");

		return -ENOTDIR;
@@ -213,7 +213,7 @@ int nfs4_path_walk(struct nfs_server *server, 
		return ret;

	}



	if (fattr.type != NFDIR) {

	if (!S_ISDIR(fattr.mode)) {

		printk(KERN_ERR "nfs4_get_root:"

		       " lookupfh encountered non-directory\n");

		return -ENOTDIR;

fs/nfs/nfs2xdr.c

+3 −4
Original line number Diff line number Diff line
@@ -120,8 +120,8 @@ xdr_decode_time(__be32 *p, struct timespec *timep) 
static __be32 *

xdr_decode_fattr(__be32 *p, struct nfs_fattr *fattr)

{

	u32 rdev;

	fattr->type = (enum nfs_ftype) ntohl(*p++);

	u32 rdev, type;

	type = ntohl(*p++);

	fattr->mode = ntohl(*p++);

	fattr->nlink = ntohl(*p++);

	fattr->uid = ntohl(*p++);
@@ -138,8 +138,7 @@ xdr_decode_fattr(__be32 *p, struct nfs_fattr *fattr) 
	p = xdr_decode_time(p, &fattr->ctime);

	fattr->valid |= NFS_ATTR_FATTR_V2;

	fattr->rdev = new_decode_dev(rdev);

	if (fattr->type == NFCHR && rdev == NFS2_FIFO_DEV) {

		fattr->type = NFFIFO;

	if (type == NFCHR && rdev == NFS2_FIFO_DEV) {

		fattr->mode = (fattr->mode & ~S_IFMT) | S_IFIFO;

		fattr->rdev = 0;

	}

fs/nfs/nfs3xdr.c

+13 −18
Original line number Diff line number Diff line
@@ -91,19 +91,15 @@ 
/*

 * Map file type to S_IFMT bits

 */

static struct {

	unsigned int	mode;

	unsigned int	nfs2type;

} nfs_type2fmt[] = {

      { 0,		NFNON	},

      { S_IFREG,	NFREG	},

      { S_IFDIR,	NFDIR	},

      { S_IFBLK,	NFBLK	},

      { S_IFCHR,	NFCHR	},

      { S_IFLNK,	NFLNK	},

      { S_IFSOCK,	NFSOCK	},

      { S_IFIFO,	NFFIFO	},

      { 0,		NFBAD	}

static const umode_t nfs_type2fmt[] = {

	[NF3BAD] = 0,

	[NF3REG] = S_IFREG,

	[NF3DIR] = S_IFDIR,

	[NF3BLK] = S_IFBLK,

	[NF3CHR] = S_IFCHR,

	[NF3LNK] = S_IFLNK,

	[NF3SOCK] = S_IFSOCK,

	[NF3FIFO] = S_IFIFO,

};



/*
@@ -148,13 +144,12 @@ static __be32 * 
xdr_decode_fattr(__be32 *p, struct nfs_fattr *fattr)

{

	unsigned int	type, major, minor;

	int		fmode;

	umode_t		fmode;



	type = ntohl(*p++);

	if (type >= NF3BAD)

		type = NF3BAD;

	fmode = nfs_type2fmt[type].mode;

	fattr->type = nfs_type2fmt[type].nfs2type;

	if (type > NF3FIFO)

		type = NF3NON;

	fmode = nfs_type2fmt[type];

	fattr->mode = (ntohl(*p++) & ~S_IFMT) | fmode;

	fattr->nlink = ntohl(*p++);

	fattr->uid = ntohl(*p++);

fs/nfs/nfs4xdr.c

+19 −21
Original line number Diff line number Diff line
@@ -522,20 +522,17 @@ static int nfs4_stat_to_errno(int); 
				 decode_lookup_maxsz + \

				 decode_fs_locations_maxsz)



static struct {

	unsigned int	mode;

	unsigned int	nfs2type;

} nfs_type2fmt[] = {

	{ 0,		NFNON	     },

	{ S_IFREG,	NFREG	     },

	{ S_IFDIR,	NFDIR	     },

	{ S_IFBLK,	NFBLK	     },

	{ S_IFCHR,	NFCHR	     },

	{ S_IFLNK,	NFLNK	     },

	{ S_IFSOCK,	NFSOCK	     },

	{ S_IFIFO,	NFFIFO	     },

	{ 0,		NFNON	     },

	{ 0,		NFNON	     },

static const umode_t nfs_type2fmt[] = {

	[NF4BAD] = 0,

	[NF4REG] = S_IFREG,

	[NF4DIR] = S_IFDIR,

	[NF4BLK] = S_IFBLK,

	[NF4CHR] = S_IFCHR,

	[NF4LNK] = S_IFLNK,

	[NF4SOCK] = S_IFSOCK,

	[NF4FIFO] = S_IFIFO,

	[NF4ATTRDIR] = 0,

	[NF4NAMEDATTR] = 0,

};



struct compound_hdr {
@@ -2173,7 +2170,7 @@ static int decode_attr_type(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t * 
		}

		bitmap[0] &= ~FATTR4_WORD0_TYPE;

	}

	dprintk("%s: type=0%o\n", __func__, nfs_type2fmt[*type].nfs2type);

	dprintk("%s: type=0%o\n", __func__, nfs_type2fmt[*type]);

	return 0;

}
@@ -2580,8 +2577,9 @@ static int decode_attr_maxwrite(struct xdr_stream *xdr, uint32_t *bitmap, uint32 
	return status;

}



static int decode_attr_mode(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *mode)

static int decode_attr_mode(struct xdr_stream *xdr, uint32_t *bitmap, umode_t *mode)

{

	uint32_t tmp;

	__be32 *p;



	*mode = 0;
@@ -2589,8 +2587,8 @@ static int decode_attr_mode(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t * 
		return -EIO;

	if (likely(bitmap[1] & FATTR4_WORD1_MODE)) {

		READ_BUF(4);

		READ32(*mode);

		*mode &= ~S_IFMT;

		READ32(tmp);

		*mode = tmp & ~S_IFMT;

		bitmap[1] &= ~FATTR4_WORD1_MODE;

	}

	dprintk("%s: file mode=0%o\n", __func__, (unsigned int)*mode);
@@ -2994,7 +2992,8 @@ static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, cons 
	uint32_t attrlen,

		 bitmap[2] = {0},

		 type;

	int status, fmode = 0;

	int status;

	umode_t fmode = 0;

	uint64_t fileid;



	if ((status = decode_op_hdr(xdr, OP_GETATTR)) != 0)
@@ -3008,8 +3007,7 @@ static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, cons 


	if ((status = decode_attr_type(xdr, bitmap, &type)) != 0)

		goto xdr_error;

	fattr->type = nfs_type2fmt[type].nfs2type;

	fattr->mode = nfs_type2fmt[type].mode;

	fattr->mode = nfs_type2fmt[type];



	if ((status = decode_attr_change(xdr, bitmap, &fattr->change_attr)) != 0)

		goto xdr_error;

include/linux/nfs_xdr.h

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ static inline int nfs_fsid_equal(const struct nfs_fsid *a, const struct nfs_fsid 


struct nfs_fattr {

	unsigned int		valid;		/* which fields are valid */

	enum nfs_ftype		type;		/* always use NFSv2 types */

	__u32			mode;

	umode_t			mode;

	__u32			nlink;

	__u32			uid;

	__u32			gid;