smb3: add debug messages for closing unmatched open (87bc2376) · Commits · 戴 / test

fs/cifs/cifsglob.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1552,6 +1552,8 @@ struct close_cancelled_open {
		struct cifs_fid fid;
		struct cifs_tcon *tcon;
		struct work_struct work;
		__u64 mid;
		__u16 cmd;
		};

		/* Make code in transport.c a little cleaner by moving

fs/cifs/smb2misc.c

+32 −10

Original line number	Diff line number	Diff line
		@@ -729,19 +729,35 @@ smb2_cancelled_close_fid(struct work_struct *work)
		{
		struct close_cancelled_open *cancelled = container_of(work,
		struct close_cancelled_open, work);
		struct cifs_tcon *tcon = cancelled->tcon;
		int rc;

		cifs_dbg(VFS, "Close unmatched open\n");
		if (cancelled->mid)
		cifs_tcon_dbg(VFS, "Close unmatched open for MID:%llx\n",
		cancelled->mid);
		else
		cifs_tcon_dbg(VFS, "Close interrupted close\n");

		SMB2_close(0, cancelled->tcon, cancelled->fid.persistent_fid,
		rc = SMB2_close(0, tcon, cancelled->fid.persistent_fid,
		cancelled->fid.volatile_fid);
		cifs_put_tcon(cancelled->tcon);
		if (rc)
		cifs_tcon_dbg(VFS, "Close cancelled mid failed rc:%d\n", rc);

		cifs_put_tcon(tcon);
		kfree(cancelled);
		}

		/* Caller should already has an extra reference to @tcon */
		/*
		* Caller should already has an extra reference to @tcon
		* This function is used to queue work to close a handle to prevent leaks
		* on the server.
		* We handle two cases. If an open was interrupted after we sent the
		* SMB2_CREATE to the server but before we processed the reply, and second
		* if a close was interrupted before we sent the SMB2_CLOSE to the server.
		*/
		static int
		__smb2_handle_cancelled_close(struct cifs_tcon *tcon, __u64 persistent_fid,
		__u64 volatile_fid)
		__smb2_handle_cancelled_cmd(struct cifs_tcon *tcon, __u16 cmd, __u64 mid,
		__u64 persistent_fid, __u64 volatile_fid)
		{
		struct close_cancelled_open *cancelled;

		@@ -752,6 +768,8 @@ __smb2_handle_cancelled_close(struct cifs_tcon *tcon, __u64 persistent_fid,
		cancelled->fid.persistent_fid = persistent_fid;
		cancelled->fid.volatile_fid = volatile_fid;
		cancelled->tcon = tcon;
		cancelled->cmd = cmd;
		cancelled->mid = mid;
		INIT_WORK(&cancelled->work, smb2_cancelled_close_fid);
		WARN_ON(queue_work(cifsiod_wq, &cancelled->work) == false);

		@@ -769,7 +787,8 @@ smb2_handle_cancelled_close(struct cifs_tcon *tcon, __u64 persistent_fid,
		tcon->tc_count++;
		spin_unlock(&cifs_tcp_ses_lock);

		rc = __smb2_handle_cancelled_close(tcon, persistent_fid, volatile_fid);
		rc = __smb2_handle_cancelled_cmd(tcon, SMB2_CLOSE_HE, 0,
		persistent_fid, volatile_fid);
		if (rc)
		cifs_put_tcon(tcon);

		@@ -793,7 +812,10 @@ smb2_handle_cancelled_mid(char buffer, struct TCP_Server_Info server)
		if (!tcon)
		return -ENOENT;

		rc = __smb2_handle_cancelled_close(tcon, rsp->PersistentFileId,
		rc = __smb2_handle_cancelled_cmd(tcon,
		le16_to_cpu(sync_hdr->Command),
		le64_to_cpu(sync_hdr->MessageId),
		rsp->PersistentFileId,
		rsp->VolatileFileId);
		if (rc)
		cifs_put_tcon(tcon);

Admin message