Unverified Commit ce95240b authored by Steve French's avatar Steve French Committed by GitHub
Browse files

Merge pull request #53 from namjaejeon/cifsd-for-next 

cifsd-fixes
parents 55b4fcdf 97d7f3d3

fs/cifsd/mgmt/share_config.h

+3 −3
Original line number Diff line number Diff line
@@ -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)

{

fs/cifsd/mgmt/user_session.h

+1 −3
Original line number Diff line number Diff line
@@ -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
@@ -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];

fs/cifsd/mgmt/share_config.c

+1 −1

File changed.

Contains only whitespace changes.

fs/cifsd/mgmt/tree_connect.c

+1 −1

File changed.

Contains only whitespace changes.