Commit 091619ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.9-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:

 - Add missing trace point (noticed when debugging the recent mknod LSM
   regression)

 - fscache fix

* tag '6.9-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Fix duplicate fscache cookie warnings
  smb3: add trace event for mknod
parents 3a3c0de6 8876a372

fs/smb/client/dir.c

+7 −0
Original line number Diff line number Diff line
@@ -612,11 +612,18 @@ int cifs_mknod(struct mnt_idmap *idmap, struct inode *inode, 
		goto mknod_out;

	}



	trace_smb3_mknod_enter(xid, tcon->ses->Suid, tcon->tid, full_path);



	rc = tcon->ses->server->ops->make_node(xid, inode, direntry, tcon,

					       full_path, mode,

					       device_number);



mknod_out:

	if (rc)

		trace_smb3_mknod_err(xid,  tcon->ses->Suid, tcon->tid, rc);

	else

		trace_smb3_mknod_done(xid, tcon->ses->Suid, tcon->tid);



	free_dentry_path(page);

	free_xid(xid);

	cifs_put_tlink(tlink);

fs/smb/client/fscache.c

+15 −1
Original line number Diff line number Diff line
@@ -12,6 +12,16 @@ 
#include "cifs_fs_sb.h"

#include "cifsproto.h"



/*

 * Key for fscache inode.  [!] Contents must match comparisons in cifs_find_inode().

 */

struct cifs_fscache_inode_key {



	__le64  uniqueid;	/* server inode number */

	__le64  createtime;	/* creation time on server */

	u8	type;		/* S_IFMT file type */

} __packed;



static void cifs_fscache_fill_volume_coherency(

	struct cifs_tcon *tcon,

	struct cifs_fscache_volume_coherency_data *cd)
@@ -97,15 +107,19 @@ void cifs_fscache_release_super_cookie(struct cifs_tcon *tcon) 
void cifs_fscache_get_inode_cookie(struct inode *inode)

{

	struct cifs_fscache_inode_coherency_data cd;

	struct cifs_fscache_inode_key key;

	struct cifsInodeInfo *cifsi = CIFS_I(inode);

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);



	key.uniqueid	= cpu_to_le64(cifsi->uniqueid);

	key.createtime	= cpu_to_le64(cifsi->createtime);

	key.type	= (inode->i_mode & S_IFMT) >> 12;

	cifs_fscache_fill_coherency(&cifsi->netfs.inode, &cd);



	cifsi->netfs.cache =

		fscache_acquire_cookie(tcon->fscache, 0,

				       &cifsi->uniqueid, sizeof(cifsi->uniqueid),

				       &key, sizeof(key),

				       &cd, sizeof(cd),

				       i_size_read(&cifsi->netfs.inode));

	if (cifsi->netfs.cache)

fs/smb/client/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -1351,6 +1351,8 @@ cifs_find_inode(struct inode *inode, void *opaque) 
{

	struct cifs_fattr *fattr = opaque;



	/* [!] The compared values must be the same in struct cifs_fscache_inode_key. */



	/* don't match inode with different uniqueid */

	if (CIFS_I(inode)->uniqueid != fattr->cf_uniqueid)

		return 0;

fs/smb/client/trace.h

+3 −1
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT(get_reparse_compound_enter); 
DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT(delete_enter);

DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT(mkdir_enter);

DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT(tdis_enter);

DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT(mknod_enter);



DECLARE_EVENT_CLASS(smb3_inf_compound_done_class,

	TP_PROTO(unsigned int xid,
@@ -415,7 +416,7 @@ DEFINE_SMB3_INF_COMPOUND_DONE_EVENT(query_wsl_ea_compound_done); 
DEFINE_SMB3_INF_COMPOUND_DONE_EVENT(delete_done);

DEFINE_SMB3_INF_COMPOUND_DONE_EVENT(mkdir_done);

DEFINE_SMB3_INF_COMPOUND_DONE_EVENT(tdis_done);



DEFINE_SMB3_INF_COMPOUND_DONE_EVENT(mknod_done);



DECLARE_EVENT_CLASS(smb3_inf_compound_err_class,

	TP_PROTO(unsigned int xid,
@@ -461,6 +462,7 @@ DEFINE_SMB3_INF_COMPOUND_ERR_EVENT(query_wsl_ea_compound_err); 
DEFINE_SMB3_INF_COMPOUND_ERR_EVENT(mkdir_err);

DEFINE_SMB3_INF_COMPOUND_ERR_EVENT(delete_err);

DEFINE_SMB3_INF_COMPOUND_ERR_EVENT(tdis_err);

DEFINE_SMB3_INF_COMPOUND_ERR_EVENT(mknod_err);



/*

 * For logging SMB3 Status code and Command for responses which return errors