Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcd87838 authored Jun 06, 2017 by Pavel Shilovsky Committed by Steve French Jun 20, 2017

CIFS: Improve readdir verbosity



Downgrade the loglevel for SMB2 to prevent filling the log
with messages if e.g. readdir was interrupted. Also make SMB2
and SMB1 codepaths do the same logging during readdir.

Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <smfrench@gmail.com>
CC: Stable <stable@vger.kernel.org>

parent ecf3411a

fs/cifs/smb1ops.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -849,8 +849,13 @@ cifs_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
		struct cifs_fid *fid, __u16 search_flags,
		struct cifs_search_info *srch_inf)
		{
		return CIFSFindFirst(xid, tcon, path, cifs_sb,
		int rc;

		rc = CIFSFindFirst(xid, tcon, path, cifs_sb,
		&fid->netfid, search_flags, srch_inf, true);
		if (rc)
		cifs_dbg(FYI, "find first failed=%d\n", rc);
		return rc;
		}

		static int

fs/cifs/smb2ops.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -982,7 +982,7 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
		rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL);
		kfree(utf16_path);
		if (rc) {
		cifs_dbg(VFS, "open dir failed\n");
		cifs_dbg(FYI, "open dir failed rc=%d\n", rc);
		return rc;
		}

		@@ -992,7 +992,7 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
		rc = SMB2_query_directory(xid, tcon, fid->persistent_fid,
		fid->volatile_fid, 0, srch_inf);
		if (rc) {
		cifs_dbg(VFS, "query directory failed\n");
		cifs_dbg(FYI, "query directory failed rc=%d\n", rc);
		SMB2_close(xid, tcon, fid->persistent_fid, fid->volatile_fid);
		}
		return rc;