Commit f44106e2 authored Jul 23, 2012 by Jeff Layton Committed by Trond Myklebust Jul 30, 2012

nfs: fix fl_type tests in NFSv4 code



fl_type is not a bitmap.

Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent c95908e4

fs/nfs/nfs4proc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4885,7 +4885,7 @@ nfs4_proc_lock(struct file filp, int cmd, struct file_lock request)
		* Don't rely on the VFS having checked the file open mode,
		* since it won't do this for flock() locks.
		*/
		switch (request->fl_type & (F_RDLCK\|F_WRLCK\|F_UNLCK)) {
		switch (request->fl_type) {
		case F_RDLCK:
		if (!(filp->f_mode & FMODE_READ))
		return -EBADF;

fs/nfs/nfs4xdr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1236,7 +1236,7 @@ static void encode_link(struct xdr_stream xdr, const struct qstr name, struct

		static inline int nfs4_lock_type(struct file_lock *fl, int block)
		{
		if ((fl->fl_type & (F_RDLCK\|F_WRLCK\|F_UNLCK)) == F_RDLCK)
		if (fl->fl_type == F_RDLCK)
		return block ? NFS4_READW_LT : NFS4_READ_LT;
		return block ? NFS4_WRITEW_LT : NFS4_WRITE_LT;
		}