Commit 8205ae32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.17-rc-part2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:

 - multichannel fixes, addressing additional reconnect and DFS scenarios

 - reenabling fscache support (indexing rewrite, metadata caching e.g.)

 - send additional version information during NTLMSSP negotiate to
   improve debugging

 - fix for a mount race

 - DFS fixes

 - fix for a memory leak for stable

* tag '5.17-rc-part2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: update internal module number
  smb3: send NTLMSSP version information
  cifs: Support fscache indexing rewrite
  cifs: cifs_ses_mark_for_reconnect should also update reconnect bits
  cifs: update tcpStatus during negotiate and sess setup
  cifs: make status checks in version independent callers
  cifs: remove repeated state change in dfs tree connect
  cifs: fix the cifs_reconnect path for DFS
  cifs: remove unused variable ses_selected
  cifs: protect all accesses to chan_* with chan_lock
  cifs: fix the connection state transitions with multichannel
  cifs: check reconnects for channels of active tcons too
  smb3: add new defines from protocol specification
  cifs: serialize all mount attempts
  cifs: quirk for STATUS_OBJECT_NAME_INVALID returned for non-ASCII dfs refs
  cifs: alloc_path_with_tree_prefix: do not append sep. if the path is empty
  cifs: clean up an inconsistent indenting
  cifs: free ntlmsspblob allocated in negotiate
parents 1cb69c80 51620150

fs/cifs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ config CIFS_SMB_DIRECT 


config CIFS_FSCACHE

	bool "Provide CIFS client caching support"

	depends on CIFS=m && FSCACHE_OLD_API || CIFS=y && FSCACHE_OLD_API=y

	depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y

	help

	  Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data

	  to be cached locally on disk through the general filesystem cache

fs/cifs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ cifs-$(CONFIG_CIFS_DFS_UPCALL) += cifs_dfs_ref.o dfs_cache.o 


cifs-$(CONFIG_CIFS_SWN_UPCALL) += netlink.o cifs_swn.o



cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o

cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o



cifs-$(CONFIG_CIFS_SMB_DIRECT) += smbdirect.o

fs/cifs/cache.c

deleted100644 → 0
+0 −105
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

/*

 *   CIFS filesystem cache index structure definitions

 *

 *   Copyright (c) 2010 Novell, Inc.

 *   Authors(s): Suresh Jayaraman (sjayaraman@suse.de>

 *

 */

#include "fscache.h"

#include "cifs_debug.h"



/*

 * CIFS filesystem definition for FS-Cache

 */

struct fscache_netfs cifs_fscache_netfs = {

	.name = "cifs",

	.version = 0,

};



/*

 * Register CIFS for caching with FS-Cache

 */

int cifs_fscache_register(void)

{

	return fscache_register_netfs(&cifs_fscache_netfs);

}



/*

 * Unregister CIFS for caching

 */

void cifs_fscache_unregister(void)

{

	fscache_unregister_netfs(&cifs_fscache_netfs);

}



/*

 * Server object for FS-Cache

 */

const struct fscache_cookie_def cifs_fscache_server_index_def = {

	.name = "CIFS.server",

	.type = FSCACHE_COOKIE_TYPE_INDEX,

};



static enum

fscache_checkaux cifs_fscache_super_check_aux(void *cookie_netfs_data,

					      const void *data,

					      uint16_t datalen,

					      loff_t object_size)

{

	struct cifs_fscache_super_auxdata auxdata;

	const struct cifs_tcon *tcon = cookie_netfs_data;



	if (datalen != sizeof(auxdata))

		return FSCACHE_CHECKAUX_OBSOLETE;



	memset(&auxdata, 0, sizeof(auxdata));

	auxdata.resource_id = tcon->resource_id;

	auxdata.vol_create_time = tcon->vol_create_time;

	auxdata.vol_serial_number = tcon->vol_serial_number;



	if (memcmp(data, &auxdata, datalen) != 0)

		return FSCACHE_CHECKAUX_OBSOLETE;



	return FSCACHE_CHECKAUX_OKAY;

}



/*

 * Superblock object for FS-Cache

 */

const struct fscache_cookie_def cifs_fscache_super_index_def = {

	.name = "CIFS.super",

	.type = FSCACHE_COOKIE_TYPE_INDEX,

	.check_aux = cifs_fscache_super_check_aux,

};



static enum

fscache_checkaux cifs_fscache_inode_check_aux(void *cookie_netfs_data,

					      const void *data,

					      uint16_t datalen,

					      loff_t object_size)

{

	struct cifs_fscache_inode_auxdata auxdata;

	struct cifsInodeInfo *cifsi = cookie_netfs_data;



	if (datalen != sizeof(auxdata))

		return FSCACHE_CHECKAUX_OBSOLETE;



	memset(&auxdata, 0, sizeof(auxdata));

	auxdata.eof = cifsi->server_eof;

	auxdata.last_write_time_sec = cifsi->vfs_inode.i_mtime.tv_sec;

	auxdata.last_change_time_sec = cifsi->vfs_inode.i_ctime.tv_sec;

	auxdata.last_write_time_nsec = cifsi->vfs_inode.i_mtime.tv_nsec;

	auxdata.last_change_time_nsec = cifsi->vfs_inode.i_ctime.tv_nsec;



	if (memcmp(data, &auxdata, datalen) != 0)

		return FSCACHE_CHECKAUX_OBSOLETE;



	return FSCACHE_CHECKAUX_OKAY;

}



const struct fscache_cookie_def cifs_fscache_inode_object_def = {

	.name		= "CIFS.uniqueid",

	.type		= FSCACHE_COOKIE_TYPE_DATAFILE,

	.check_aux	= cifs_fscache_inode_check_aux,

};

fs/cifs/cifs_swn.c

+3 −6
Original line number Diff line number Diff line
@@ -396,11 +396,11 @@ static int cifs_swn_resource_state_changed(struct cifs_swn_reg *swnreg, const ch 
	switch (state) {

	case CIFS_SWN_RESOURCE_STATE_UNAVAILABLE:

		cifs_dbg(FYI, "%s: resource name '%s' become unavailable\n", __func__, name);

		cifs_ses_mark_for_reconnect(swnreg->tcon->ses);

		cifs_reconnect(swnreg->tcon->ses->server, true);

		break;

	case CIFS_SWN_RESOURCE_STATE_AVAILABLE:

		cifs_dbg(FYI, "%s: resource name '%s' become available\n", __func__, name);

		cifs_ses_mark_for_reconnect(swnreg->tcon->ses);

		cifs_reconnect(swnreg->tcon->ses->server, true);

		break;

	case CIFS_SWN_RESOURCE_STATE_UNKNOWN:

		cifs_dbg(FYI, "%s: resource name '%s' changed to unknown state\n", __func__, name);
@@ -498,10 +498,7 @@ static int cifs_swn_reconnect(struct cifs_tcon *tcon, struct sockaddr_storage *a 
		goto unlock;

	}



	spin_lock(&cifs_tcp_ses_lock);

	if (tcon->ses->server->tcpStatus != CifsExiting)

		tcon->ses->server->tcpStatus = CifsNeedReconnect;

	spin_unlock(&cifs_tcp_ses_lock);

	cifs_reconnect(tcon->ses->server, false);



unlock:

	mutex_unlock(&tcon->ses->server->srv_mutex);

fs/cifs/cifsfs.c

+11 −8
Original line number Diff line number Diff line
@@ -397,6 +397,9 @@ static void 
cifs_evict_inode(struct inode *inode)

{

	truncate_inode_pages_final(&inode->i_data);

	if (inode->i_state & I_PINNING_FSCACHE_WB)

		cifs_fscache_unuse_inode_cookie(inode, true);

	cifs_fscache_release_inode_cookie(inode);

	clear_inode(inode);

}
@@ -721,6 +724,12 @@ static int cifs_show_stats(struct seq_file *s, struct dentry *root) 
}

#endif



static int cifs_write_inode(struct inode *inode, struct writeback_control *wbc)

{

	fscache_unpin_writeback(wbc, cifs_inode_cookie(inode));

	return 0;

}



static int cifs_drop_inode(struct inode *inode)

{

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
@@ -733,6 +742,7 @@ static int cifs_drop_inode(struct inode *inode) 
static const struct super_operations cifs_super_ops = {

	.statfs = cifs_statfs,

	.alloc_inode = cifs_alloc_inode,

	.write_inode	= cifs_write_inode,

	.free_inode = cifs_free_inode,

	.drop_inode	= cifs_drop_inode,

	.evict_inode	= cifs_evict_inode,
@@ -1625,13 +1635,9 @@ init_cifs(void) 
		goto out_destroy_cifsoplockd_wq;

	}



	rc = cifs_fscache_register();

	if (rc)

		goto out_destroy_deferredclose_wq;



	rc = cifs_init_inodecache();

	if (rc)

		goto out_unreg_fscache;

		goto out_destroy_deferredclose_wq;



	rc = cifs_init_mids();

	if (rc)
@@ -1693,8 +1699,6 @@ init_cifs(void) 
	cifs_destroy_mids();

out_destroy_inodecache:

	cifs_destroy_inodecache();

out_unreg_fscache:

	cifs_fscache_unregister();

out_destroy_deferredclose_wq:

	destroy_workqueue(deferredclose_wq);

out_destroy_cifsoplockd_wq:
@@ -1730,7 +1734,6 @@ exit_cifs(void) 
	cifs_destroy_request_bufs();

	cifs_destroy_mids();

	cifs_destroy_inodecache();

	cifs_fscache_unregister();

	destroy_workqueue(deferredclose_wq);

	destroy_workqueue(cifsoplockd_wq);

	destroy_workqueue(decrypt_wq);