summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Shilovsky <pshilov@microsoft.com>2016-10-11 15:34:07 -0700
committerSteve French <smfrench@gmail.com>2016-10-13 19:48:59 -0500
commitde74025052ef63852d80a444ea19f2bdd7bec63f (patch)
tree472bb2dd2be1ffcb96d6a7edd25e1831ad32fcd9
parentf2cca6a7c99fdeadacd0bdc37d825c4bc2b03653 (diff)
downloadop-kernel-dev-de74025052ef63852d80a444ea19f2bdd7bec63f.zip
op-kernel-dev-de74025052ef63852d80a444ea19f2bdd7bec63f.tar.gz
CIFS: Reset read oplock to NONE if we have mandatory locks after reopen
We are already doing the same thing for an ordinary open case: we can't keep read oplock on a file if we have mandatory byte-range locks because pagereading can conflict with these locks on a server. Fix it by setting oplock level to NONE. Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com> Signed-off-by: Steve French <smfrench@gmail.com>
-rw-r--r--fs/cifs/file.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 07c14f9..7f5f617 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -739,6 +739,15 @@ reopen_success:
* to the server to get the new inode info.
*/
+ /*
+ * If the server returned a read oplock and we have mandatory brlocks,
+ * set oplock level to None.
+ */
+ if (server->ops->is_read_op(oplock) && cifs_has_mand_locks(cinode)) {
+ cifs_dbg(FYI, "Reset oplock val from read to None due to mand locks\n");
+ oplock = 0;
+ }
+
server->ops->set_fid(cfile, &cfile->fid, oplock);
if (oparms.reconnect)
cifs_relock_file(cfile);
OpenPOWER on IntegriCloud