diff options
| author | Namjae Jeon <namjae.jeon@samsung.com> | 2021-06-29 09:24:31 +0900 |
|---|---|---|
| committer | Namjae Jeon <namjae.jeon@samsung.com> | 2021-06-29 15:07:56 +0900 |
| commit | 849fbc549d4cca576d659d7df139c5f04104cb48 (patch) | |
| tree | c08ec3ed07c893b77054e952a5b811755b4d2f95 /fs/ksmbd | |
| parent | 12202c0594b18218e1645fd0fad92cf77a1f3145 (diff) | |
| download | linux-849fbc549d4cca576d659d7df139c5f04104cb48.tar.gz linux-849fbc549d4cca576d659d7df139c5f04104cb48.tar.bz2 linux-849fbc549d4cca576d659d7df139c5f04104cb48.zip | |
ksmbd: opencode to remove ATTR_FP macro
Opencode to remove ATTR_FP macro.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/ksmbd')
| -rw-r--r-- | fs/ksmbd/oplock.c | 4 | ||||
| -rw-r--r-- | fs/ksmbd/vfs_cache.h | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/fs/ksmbd/oplock.c b/fs/ksmbd/oplock.c index 3f0dd9b35c78..43c8b7ce6095 100644 --- a/fs/ksmbd/oplock.c +++ b/fs/ksmbd/oplock.c @@ -1111,7 +1111,9 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid, goto set_lev; /* grant none-oplock if second open is trunc */ - if (ATTR_FP(fp)) { + if (fp->attrib_only && fp->cdoption != FILE_OVERWRITE_IF_LE && + fp->cdoption != FILE_OVERWRITE_LE && + fp->cdoption != FILE_SUPERSEDE_LE) { req_op_level = SMB2_OPLOCK_LEVEL_NONE; goto set_lev; } diff --git a/fs/ksmbd/vfs_cache.h b/fs/ksmbd/vfs_cache.h index 752cbdab3522..543494f664cb 100644 --- a/fs/ksmbd/vfs_cache.h +++ b/fs/ksmbd/vfs_cache.h @@ -25,11 +25,6 @@ #define KSMBD_NO_FID (UINT_MAX) #define SMB2_NO_FID (0xFFFFFFFFFFFFFFFFULL) -#define ATTR_FP(fp) ((fp)->attrib_only && \ - ((fp)->cdoption != FILE_OVERWRITE_IF_LE && \ - (fp)->cdoption != FILE_OVERWRITE_LE && \ - (fp)->cdoption != FILE_SUPERSEDE_LE)) - struct ksmbd_conn; struct ksmbd_session; |