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>

diff --git a/fs/ksmbd/oplock.c b/fs/ksmbd/oplock.c
index 43c8b7ce609566cd62d6ef74dcb89e795ec633d3..a9f171ccf77095719ed3b00fb96946c7add8d1b9 100644 (file)
--- 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 9fb7ea74e86c67ce6ab82e60d2ee1bc43aa44e1d..119b8047cfbd400e146e57e5b81a3343a611336d 100644 (file)
--- 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