evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfs: fix fl_type tests in NFSv4 code

Browse source 
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>
This commit is contained in:
Jeff Layton 2012-07-23 15:49:56 -04:00 • committed by Trond Myklebust
parent c95908e4c5
commit f44106e217
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/nfs/nfs4proc.c
View file

@ -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, * Don't rely on the VFS having checked the file open mode,
* since it won't do this for flock() locks. * 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: case F_RDLCK:
if (!(filp->f_mode & FMODE_READ)) if (!(filp->f_mode & FMODE_READ))
return -EBADF; return -EBADF;

2
fs/nfs/nfs4xdr.c
View file

@ -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) 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_READW_LT : NFS4_READ_LT;
return block ? NFS4_WRITEW_LT : NFS4_WRITE_LT; return block ? NFS4_WRITEW_LT : NFS4_WRITE_LT;
} }