diff options
| author | Hyunchul Lee <hyc.lee@gmail.com> | 2021-06-25 07:02:10 +0900 |
|---|---|---|
| committer | Namjae Jeon <namjae.jeon@samsung.com> | 2021-06-29 15:05:50 +0900 |
| commit | d4075abbc6b571e9d03d7a742e53fd6085223649 (patch) | |
| tree | efc9602ef700f75c32e77dedceb3004a5fca3ab4 | |
| parent | cb5b047f8e14e91774f68625dafb130fb160b4eb (diff) | |
| download | linux-stable-d4075abbc6b571e9d03d7a742e53fd6085223649.tar.gz linux-stable-d4075abbc6b571e9d03d7a742e53fd6085223649.tar.bz2 linux-stable-d4075abbc6b571e9d03d7a742e53fd6085223649.zip | |
ksmbd: remove getting worker state macros
Remove getting worker state macros
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
| -rw-r--r-- | fs/ksmbd/ksmbd_work.h | 4 | ||||
| -rw-r--r-- | fs/ksmbd/smb2pdu.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/fs/ksmbd/ksmbd_work.h b/fs/ksmbd/ksmbd_work.h index 0e2d4f3fc49f..a91abd438a85 100644 --- a/fs/ksmbd/ksmbd_work.h +++ b/fs/ksmbd/ksmbd_work.h @@ -86,10 +86,6 @@ struct ksmbd_work { struct list_head interim_entry; }; -#define WORK_CANCELLED(w) ((w)->state == KSMBD_WORK_CANCELLED) -#define WORK_CLOSED(w) ((w)->state == KSMBD_WORK_CLOSED) -#define WORK_ACTIVE(w) ((w)->state == KSMBD_WORK_ACTIVE) - #define RESPONSE_BUF_NEXT(w) \ (((w)->response_buf + (w)->next_smb2_rsp_hdr_off)) #define REQUEST_BUF_NEXT(w) \ diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c index 25715d57c2bb..38a36390b64d 100644 --- a/fs/ksmbd/smb2pdu.c +++ b/fs/ksmbd/smb2pdu.c @@ -6716,12 +6716,12 @@ skip: err = ksmbd_vfs_posix_lock_wait(flock); - if (!WORK_ACTIVE(work)) { + if (work->state != KSMBD_WORK_ACTIVE) { list_del(&smb_lock->llist); list_del(&smb_lock->glist); locks_free_lock(flock); - if (WORK_CANCELLED(work)) { + if (work->state == KSMBD_WORK_CANCELLED) { spin_lock(&fp->f_lock); list_del(&work->fp_entry); spin_unlock(&fp->f_lock); |