From 9645759ce6b39013231f4fa312834935c93fe5bc Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <lsahlber@redhat.com>
Date: Thu, 4 Oct 2018 09:24:38 +1000
Subject: 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>
---
 fs/cifs/cifsglob.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'fs/cifs/cifsglob.h')

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;
 };
 
 /*
-- 
cgit v1.2.3