[CIFS] Cleanup various minor breakage in previous cFYI cleanup (f19159dc) · Commits · 戴 / test

fs/cifs/cifsfs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,5 +114,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
		extern const struct export_operations cifs_export_ops;
		#endif /* EXPERIMENTAL */

		#define CIFS_VERSION "1.62"
		#define CIFS_VERSION "1.63"
		#endif /* _CIFSFS_H */

fs/cifs/cifssmb.c

+11 −11

Original line number	Diff line number	Diff line
		/*
		* fs/cifs/cifssmb.c
		*
		* Copyright (C) International Business Machines Corp., 2002,2009
		* Copyright (C) International Business Machines Corp., 2002,2010
		* Author(s): Steve French (sfrench@us.ibm.com)
		*
		* Contains the routines for constructing the SMB PDUs themselves
		@@ -493,14 +493,14 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
		goto neg_err_exit;
		}

		cFYI(1, ("LANMAN negotiated"));
		cFYI(1, "LANMAN negotiated");
		/* we will not end up setting signing flags - as no signing
		was in LANMAN and server did not return the flags on */
		goto signing_check;
		#else /* weak security disabled */
		} else if (pSMBr->hdr.WordCount == 13) {
		cERROR(1, ("mount failed, cifs module not built "
		"with CIFS_WEAK_PW_HASH support"));
		cERROR(1, "mount failed, cifs module not built "
		"with CIFS_WEAK_PW_HASH support");
		rc = -EOPNOTSUPP;
		#endif /* WEAK_PW_HASH */
		goto neg_err_exit;
		@@ -1513,7 +1513,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
		(struct smb_hdr *) pSMBr, &bytes_returned, long_op);
		cifs_stats_inc(&tcon->num_writes);
		if (rc) {
		cFYI(1, ("Send error in write = %d", rc));
		cFYI(1, "Send error in write = %d", rc);
		} else {
		*nbytes = le16_to_cpu(pSMBr->CountHigh);
		nbytes = (nbytes) << 16;
		@@ -2529,7 +2529,7 @@ validate_ntransact(char buf, char ppparm, char *ppdata,
		cFYI(1, "data starts after end of smb");
		return -EINVAL;
		} else if (data_count + *ppdata > end_of_smb) {
		cFYI(1, "data %p + count %d (%p) ends after end of smb %p start %p",
		cFYI(1, "data %p + count %d (%p) past smb end %p start %p",
		ppdata, data_count, (data_count + ppdata),
		end_of_smb, pSMBr);
		return -EINVAL;
		@@ -3304,7 +3304,7 @@ QFileInfoRetry:
		rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
		(struct smb_hdr *) pSMBr, &bytes_returned, 0);
		if (rc) {
		cFYI(1, ("Send error in QPathInfo = %d", rc));
		cFYI(1, "Send error in QPathInfo = %d", rc);
		} else { /* decode response */
		rc = validate_t2((struct smb_t2_rsp *)pSMBr);

		@@ -3472,14 +3472,14 @@ UnixQFileInfoRetry:
		rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
		(struct smb_hdr *) pSMBr, &bytes_returned, 0);
		if (rc) {
		cFYI(1, ("Send error in QPathInfo = %d", rc));
		cFYI(1, "Send error in QPathInfo = %d", rc);
		} else { /* decode response */
		rc = validate_t2((struct smb_t2_rsp *)pSMBr);

		if (rc \|\| (pSMBr->ByteCount < sizeof(FILE_UNIX_BASIC_INFO))) {
		cERROR(1, ("Malformed FILE_UNIX_BASIC_INFO response.\n"
		cERROR(1, "Malformed FILE_UNIX_BASIC_INFO response.\n"
		"Unix Extensions can be disabled on mount "
		"by specifying the nosfu mount option."));
		"by specifying the nosfu mount option.");
		rc = -EIO; /* bad smb */
		} else {
		__u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);

fs/cifs/file.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* vfs operations that deal with files
		*
		* Copyright (C) International Business Machines Corp., 2002,2007
		* Copyright (C) International Business Machines Corp., 2002,2010
		* Author(s): Steve French (sfrench@us.ibm.com)
		* Jeremy Allison (jra@samba.org)
		*
		@@ -855,9 +855,9 @@ int cifs_lock(struct file file, int cmd, struct file_lock pfLock)
		0 /* wait flag */);
		pfLock->fl_type = F_RDLCK;
		if (rc != 0)
		cERROR(1, ("Error unlocking "
		cERROR(1, "Error unlocking "
		"previously locked range %d "
		"during test of lock", rc));
		"during test of lock", rc);
		rc = 0;
		} else {
		pfLock->fl_type = F_WRLCK;
		@@ -1998,7 +1998,7 @@ static int cifs_readpages(struct file file, struct address_space mapping,
		cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
		pTcon = cifs_sb->tcon;

		cFYI(DBG2, ("rpages: num pages %d", num_pages));
		cFYI(DBG2, "rpages: num pages %d", num_pages);
		for (i = 0; i < num_pages; ) {
		unsigned contig_pages;
		struct page *tmp_page;

fs/cifs/inode.c

+11 −11

Original line number	Diff line number	Diff line
		/*
		* fs/cifs/inode.c
		*
		* Copyright (C) International Business Machines Corp., 2002,2008
		* Copyright (C) International Business Machines Corp., 2002,2010
		* Author(s): Steve French (sfrench@us.ibm.com)
		*
		* This library is free software; you can redistribute it and/or modify
		@@ -86,30 +86,30 @@ cifs_revalidate_cache(struct inode inode, struct cifs_fattr fattr)
		{
		struct cifsInodeInfo *cifs_i = CIFS_I(inode);

		cFYI(1, ("%s: revalidating inode %llu", __func__, cifs_i->uniqueid));
		cFYI(1, "%s: revalidating inode %llu", __func__, cifs_i->uniqueid);

		if (inode->i_state & I_NEW) {
		cFYI(1, ("%s: inode %llu is new", __func__, cifs_i->uniqueid));
		cFYI(1, "%s: inode %llu is new", __func__, cifs_i->uniqueid);
		return;
		}

		/* don't bother with revalidation if we have an oplock */
		if (cifs_i->clientCanCacheRead) {
		cFYI(1, ("%s: inode %llu is oplocked", __func__,
		cifs_i->uniqueid));
		cFYI(1, "%s: inode %llu is oplocked", __func__,
		cifs_i->uniqueid);
		return;
		}

		/* revalidate if mtime or size have changed */
		if (timespec_equal(&inode->i_mtime, &fattr->cf_mtime) &&
		cifs_i->server_eof == fattr->cf_eof) {
		cFYI(1, ("%s: inode %llu is unchanged", __func__,
		cifs_i->uniqueid));
		cFYI(1, "%s: inode %llu is unchanged", __func__,
		cifs_i->uniqueid);
		return;
		}

		cFYI(1, ("%s: invalidating inode %llu mapping", __func__,
		cifs_i->uniqueid));
		cFYI(1, "%s: invalidating inode %llu mapping", __func__,
		cifs_i->uniqueid);
		cifs_i->invalid_mapping = true;
		}

		@@ -1577,9 +1577,9 @@ int cifs_revalidate_dentry(struct dentry *dentry)
		goto check_inval;
		}

		cFYI(1, ("Revalidate: %s inode 0x%p count %d dentry: 0x%p d_time %ld "
		cFYI(1, "Revalidate: %s inode 0x%p count %d dentry: 0x%p d_time %ld "
		"jiffies %ld", full_path, inode, inode->i_count.counter,
		dentry, dentry->d_time, jiffies));
		dentry, dentry->d_time, jiffies);

		if (CIFS_SB(sb)->tcon->unix_ext)
		rc = cifs_get_inode_info_unix(&inode, full_path, sb, xid);

Admin message