Commit 93306970 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd 

Pull smb server fixes from Steve French:

 - two durable handle improvements

 - two small cleanup patches

* tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd:
  ksmbd: add durable scavenger timer
  ksmbd: avoid reclaiming expired durable opens by the client
  ksmbd: Constify struct ksmbd_transport_ops
  ksmbd: remove duplicate SMB2 Oplock levels definitions
parents 527eff22 d484d621

fs/smb/server/connection.h

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ struct ksmbd_transport_ops { 


struct ksmbd_transport {

	struct ksmbd_conn			*conn;

	struct ksmbd_transport_ops	*ops;

	const struct ksmbd_transport_ops	*ops;

};



#define KSMBD_TCP_RECV_TIMEOUT	(7 * HZ)

fs/smb/server/mgmt/user_session.c

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ void ksmbd_session_destroy(struct ksmbd_session *sess) 


	ksmbd_tree_conn_session_logoff(sess);

	ksmbd_destroy_file_table(&sess->file_table);

	ksmbd_launch_ksmbd_durable_scavenger();

	ksmbd_session_rpc_clear_list(sess);

	free_channel_list(sess);

	kfree(sess->Preauth_HashValue);
@@ -326,6 +327,7 @@ void destroy_previous_session(struct ksmbd_conn *conn, 


	ksmbd_destroy_file_table(&prev_sess->file_table);

	prev_sess->state = SMB2_SESSION_EXPIRED;

	ksmbd_launch_ksmbd_durable_scavenger();

out:

	up_write(&conn->session_lock);

	up_write(&sessions_table_lock);

fs/smb/server/oplock.h

+0 −7
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 


#define OPLOCK_WAIT_TIME	(35 * HZ)



/* SMB2 Oplock levels */

#define SMB2_OPLOCK_LEVEL_NONE          0x00

#define SMB2_OPLOCK_LEVEL_II            0x01

#define SMB2_OPLOCK_LEVEL_EXCLUSIVE     0x08

#define SMB2_OPLOCK_LEVEL_BATCH         0x09

#define SMB2_OPLOCK_LEVEL_LEASE         0xFF



/* Oplock states */

#define OPLOCK_STATE_NONE	0x00

#define OPLOCK_ACK_WAIT		0x01

fs/smb/server/server.c

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ static void server_ctrl_handle_reset(struct server_ctrl_struct *ctrl) 
{

	ksmbd_ipc_soft_reset();

	ksmbd_conn_transport_destroy();

	ksmbd_stop_durable_scavenger();

	server_conf_free();

	server_conf_init();

	WRITE_ONCE(server_conf.state, SERVER_STATE_STARTING_UP);

fs/smb/server/server.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct ksmbd_server_config { 
	unsigned int		max_connections;



	char			*conf[SERVER_CONF_WORK_GROUP + 1];

	struct task_struct	*dh_task;

};



extern struct ksmbd_server_config server_conf;