commit 175a4eb7ea531cdbf6d574f5d5ba9aa0f5e8ed13
author Al Viro <viro@zeniv.linux.org.uk> Tue Jul 26 03:30:54 2011 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Tue Jan 03 22:55:10 2012 -0500
tree 841812b19b8a5546e472be321b32ca58528b76c3
parent 030a8ba48fa6fa2a1304bab5b0f49360613c4af2

fs: propagate umode_t, misc bits

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/nfsd/vfs.c

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 29b1202..d25a723 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -307,7 +307,7 @@
 	struct dentry	*dentry;
 	struct inode	*inode;
 	int		accmode = NFSD_MAY_SATTR;
-	int		ftype = 0;
+	umode_t		ftype = 0;
 	__be32		err;
 	int		host_err;
 	int		size_change = 0;
@@ -730,7 +730,7 @@
  * N.B. After this call fhp needs an fh_put
  */
 __be32
-nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
+nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
 			int access, struct file **filp)
 {
 	struct dentry	*dentry;