diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2018-10-04 09:24:38 +1000 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2018-10-23 21:16:05 -0500 |
| commit | 9645759ce6b39013231f4fa312834935c93fe5bc (patch) | |
| tree | 840006325e95d43e220f1940e14f62dda503ac5c /fs/cifs/cifsproto.h | |
| parent | ff526d86051f3689fe41e235ab962389d43999a9 (diff) | |
| download | linux-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/cifsproto.h')
| -rw-r--r-- | fs/cifs/cifsproto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 20adda4de83b..fa361bc00602 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -219,7 +219,7 @@ extern void cifs_mark_open_files_invalid(struct cifs_tcon *tcon); extern void cifs_reopen_persistent_handles(struct cifs_tcon *tcon); extern bool cifs_find_lock_conflict(struct cifsFileInfo *cfile, __u64 offset, - __u64 length, __u8 type, + __u64 length, __u8 type, __u16 flags, struct cifsLockInfo **conf_lock, int rw_check); extern void cifs_add_pending_open(struct cifs_fid *fid, |