summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNamjae Jeon <namjae.jeon@samsung.com>2021-06-30 09:37:09 +0900
committerNamjae Jeon <namjae.jeon@samsung.com>2021-06-30 14:43:51 +0900
commit0ae941ef2e481e478a4b6c52a16e73c7bb4b9e3e (patch)
tree90bd8de038f1153e52faf4bdc8c87681fc4721e5
parent849fbc549d4cca576d659d7df139c5f04104cb48 (diff)
downloadlwn-0ae941ef2e481e478a4b6c52a16e73c7bb4b9e3e.tar.gz
lwn-0ae941ef2e481e478a4b6c52a16e73c7bb4b9e3e.zip
ksmbd: remove SMB1 oplock level macros
ksmbd does not support SMB1. This patch remove SMB1 oplock level macros. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Steve French <stfrench@microsoft.com>
-rw-r--r--fs/ksmbd/oplock.c2
-rw-r--r--fs/ksmbd/oplock.h6
2 files changed, 1 insertions, 7 deletions
diff --git a/fs/ksmbd/oplock.c b/fs/ksmbd/oplock.c
index 43c8b7ce6095..a9f171ccf770 100644
--- a/fs/ksmbd/oplock.c
+++ b/fs/ksmbd/oplock.c
@@ -39,7 +39,7 @@ static struct oplock_info *alloc_opinfo(struct ksmbd_work *work,
opinfo->sess = sess;
opinfo->conn = sess->conn;
- opinfo->level = OPLOCK_NONE;
+ opinfo->level = SMB2_OPLOCK_LEVEL_NONE;
opinfo->op_state = OPLOCK_STATE_NONE;
opinfo->pending_break = 0;
opinfo->fid = id;
diff --git a/fs/ksmbd/oplock.h b/fs/ksmbd/oplock.h
index 9fb7ea74e86c..119b8047cfbd 100644
--- a/fs/ksmbd/oplock.h
+++ b/fs/ksmbd/oplock.h
@@ -11,12 +11,6 @@
#define OPLOCK_WAIT_TIME (35 * HZ)
-/* SMB Oplock levels */
-#define OPLOCK_NONE 0
-#define OPLOCK_EXCLUSIVE 1
-#define OPLOCK_BATCH 2
-#define OPLOCK_READ 3 /* level 2 oplock */
-
/* SMB2 Oplock levels */
#define SMB2_OPLOCK_LEVEL_NONE 0x00
#define SMB2_OPLOCK_LEVEL_II 0x01