summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsglob.h
diff options
context:
space:
mode:
authorRonnie Sahlberg <lsahlber@redhat.com>2018-10-04 09:24:38 +1000
committerSteve French <stfrench@microsoft.com>2018-10-23 21:16:05 -0500
commit9645759ce6b39013231f4fa312834935c93fe5bc (patch)
tree840006325e95d43e220f1940e14f62dda503ac5c /fs/cifs/cifsglob.h
parentff526d86051f3689fe41e235ab962389d43999a9 (diff)
downloadlinux-9645759ce6b39013231f4fa312834935c93fe5bc.tar.bz2
cifs: OFD locks do not conflict with eachothers
RHBZ 1484130 Update cifs_find_fid_lock_conflict() to recognize that ODF locks do not conflict with eachother. Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r--fs/cifs/cifsglob.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 2a9c4ab3ec5c..819ead41bbe2 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1074,7 +1074,8 @@ struct cifsLockInfo {
__u64 offset;
__u64 length;
__u32 pid;
- __u32 type;
+ __u16 type;
+ __u16 flags;
};
/*