diff mbox series

ksmbd: Remove unused fields from ksmbd_file struct definition

Message ID 20211201204049.3617310-1-mmakassikis@freebox.fr (mailing list archive)
State New, archived
Headers show
Series ksmbd: Remove unused fields from ksmbd_file struct definition | expand

Commit Message

Marios Makassikis Dec. 1, 2021, 8:40 p.m. UTC
These fields are remnants of the not upstreamed SMB1 code.

Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
---
 fs/ksmbd/vfs_cache.h | 10 ----------
 1 file changed, 10 deletions(-)

Comments

Hyunchul Lee Dec. 4, 2021, 12:59 a.m. UTC | #1
Acked-by: Hyunchul Lee <hyc.lee@gmail.com>

2021년 12월 4일 (토) 오전 1:20, Marios Makassikis <mmakassikis@freebox.fr>님이 작성:
>
> These fields are remnants of the not upstreamed SMB1 code.
>
> Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
> ---
>  fs/ksmbd/vfs_cache.h | 10 ----------
>  1 file changed, 10 deletions(-)
>
> diff --git a/fs/ksmbd/vfs_cache.h b/fs/ksmbd/vfs_cache.h
> index 448576fbe4b7..36239ce31afd 100644
> --- a/fs/ksmbd/vfs_cache.h
> +++ b/fs/ksmbd/vfs_cache.h
> @@ -96,16 +96,6 @@ struct ksmbd_file {
>
>         int                             durable_timeout;
>
> -       /* for SMB1 */
> -       int                             pid;
> -
> -       /* conflict lock fail count for SMB1 */
> -       unsigned int                    cflock_cnt;
> -       /* last lock failure start offset for SMB1 */
> -       unsigned long long              llock_fstart;
> -
> -       int                             dirent_offset;
> -
>         /* if ls is happening on directory, below is valid*/
>         struct ksmbd_readdir_data       readdir_data;
>         int                             dot_dotdot[2];
> --
> 2.25.1
>
Namjae Jeon Dec. 4, 2021, 10:29 a.m. UTC | #2
2021-12-02 5:40 GMT+09:00, Marios Makassikis <mmakassikis@freebox.fr>:
> These fields are remnants of the not upstreamed SMB1 code.
>
> Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
diff mbox series

Patch

diff --git a/fs/ksmbd/vfs_cache.h b/fs/ksmbd/vfs_cache.h
index 448576fbe4b7..36239ce31afd 100644
--- a/fs/ksmbd/vfs_cache.h
+++ b/fs/ksmbd/vfs_cache.h
@@ -96,16 +96,6 @@  struct ksmbd_file {
 
 	int				durable_timeout;
 
-	/* for SMB1 */
-	int				pid;
-
-	/* conflict lock fail count for SMB1 */
-	unsigned int			cflock_cnt;
-	/* last lock failure start offset for SMB1 */
-	unsigned long long		llock_fstart;
-
-	int				dirent_offset;
-
 	/* if ls is happening on directory, below is valid*/
 	struct ksmbd_readdir_data	readdir_data;
 	int				dot_dotdot[2];