Skip to content

Commit

Permalink
cifsd: fix additional warnings from checkpatch.pl --strict
Browse files Browse the repository at this point in the history
Fix additional warnings from checkpatch.pl --strict.

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
  • Loading branch information
namjaejeon committed Jun 1, 2021
1 parent 2ae1a6c commit 97d7f3d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion fs/cifsd/mgmt/share_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static struct ksmbd_share_config *share_config_request(char *name)
ret = kern_path(share->path, 0, &share->vfs_path);
if (ret) {
ksmbd_debug(SMB, "failed to access '%s'\n",
share->path);
share->path);
/* Avoid put_path() */
kfree(share->path);
share->path = NULL;
Expand Down
6 changes: 3 additions & 3 deletions fs/cifsd/mgmt/share_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct ksmbd_share_config {
#define KSMBD_SHARE_INVALID_GID ((__u16)-1)

static inline int share_config_create_mode(struct ksmbd_share_config *share,
umode_t posix_mode)
umode_t posix_mode)
{
if (!share->force_create_mode) {
if (!posix_mode)
Expand All @@ -46,7 +46,7 @@ static inline int share_config_create_mode(struct ksmbd_share_config *share,
}

static inline int share_config_directory_mode(struct ksmbd_share_config *share,
umode_t posix_mode)
umode_t posix_mode)
{
if (!share->force_directory_mode) {
if (!posix_mode)
Expand All @@ -64,7 +64,7 @@ static inline int test_share_config_flag(struct ksmbd_share_config *share,
return share->flags & flag;
}

extern void __ksmbd_share_config_put(struct ksmbd_share_config *share);
void __ksmbd_share_config_put(struct ksmbd_share_config *share);

static inline void ksmbd_share_config_put(struct ksmbd_share_config *share)
{
Expand Down
2 changes: 1 addition & 1 deletion fs/cifsd/mgmt/tree_connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ksmbd_tree_conn_connect(struct ksmbd_session *sess, char *share_name)
status.tree_conn = tree_conn;

ret = xa_err(xa_store(&sess->tree_conns, tree_conn->id, tree_conn,
GFP_KERNEL));
GFP_KERNEL));
if (ret) {
status.ret = -ENOMEM;
goto out_error;
Expand Down
4 changes: 1 addition & 3 deletions fs/cifsd/mgmt/user_session.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "../smb_common.h"
#include "../ntlmssp.h"

#define CIFDS_SESSION_FLAG_SMB2 (1 << 1)
#define CIFDS_SESSION_FLAG_SMB2 BIT(1)

#define PREAUTH_HASHVALUE_SIZE 64

Expand Down Expand Up @@ -54,8 +54,6 @@ struct ksmbd_session {
struct ida tree_conn_ida;
struct list_head rpc_handle_list;



__u8 smb3encryptionkey[SMB3_ENC_DEC_KEY_SIZE];
__u8 smb3decryptionkey[SMB3_ENC_DEC_KEY_SIZE];
__u8 smb3signingkey[SMB3_SIGN_KEY_SIZE];
Expand Down

0 comments on commit 97d7f3d

Please sign in to comment.