AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[CIFS] Cleanup various minor breakage in previous cFYI cleanup

Browse Source 
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French 2010-04-21 04:12:10 +00:00
parent b6b38f704a
commit f19159dc5a
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cifs/cifsfs.h
View File

@ -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; extern const struct export_operations cifs_export_ops;
#endif /* EXPERIMENTAL */ #endif /* EXPERIMENTAL */
#define CIFS_VERSION "1.62" #define CIFS_VERSION "1.63"
#endif /* _CIFSFS_H */ #endif /* _CIFSFS_H */

22
fs/cifs/cifssmb.c
View File

@ -1,7 +1,7 @@
/* /*
* fs/cifs/cifssmb.c * 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) * Author(s): Steve French (sfrench@us.ibm.com)
* *
* Contains the routines for constructing the SMB PDUs themselves * Contains the routines for constructing the SMB PDUs themselves
@ -493,14 +493,14 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
goto neg_err_exit; goto neg_err_exit;
} }
cFYI(1, ("LANMAN negotiated")); cFYI(1, "LANMAN negotiated");
/* we will not end up setting signing flags - as no signing /* we will not end up setting signing flags - as no signing
was in LANMAN and server did not return the flags on */ was in LANMAN and server did not return the flags on */
goto signing_check; goto signing_check;
#else /* weak security disabled */ #else /* weak security disabled */
} else if (pSMBr->hdr.WordCount == 13) { } else if (pSMBr->hdr.WordCount == 13) {
cERROR(1, ("mount failed, cifs module not built " cERROR(1, "mount failed, cifs module not built "
"with CIFS_WEAK_PW_HASH support")); "with CIFS_WEAK_PW_HASH support");
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
#endif /* WEAK_PW_HASH */ #endif /* WEAK_PW_HASH */
goto neg_err_exit; goto neg_err_exit;
@ -1513,7 +1513,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
(struct smb_hdr *) pSMBr, &bytes_returned, long_op); (struct smb_hdr *) pSMBr, &bytes_returned, long_op);
cifs_stats_inc(&tcon->num_writes); cifs_stats_inc(&tcon->num_writes);
if (rc) { if (rc) {
cFYI(1, ("Send error in write = %d", rc)); cFYI(1, "Send error in write = %d", rc);
} else { } else {
*nbytes = le16_to_cpu(pSMBr->CountHigh); *nbytes = le16_to_cpu(pSMBr->CountHigh);
*nbytes = (*nbytes) << 16; *nbytes = (*nbytes) << 16;
@ -2529,7 +2529,7 @@ validate_ntransact(char *buf, char **ppparm, char **ppdata,
cFYI(1, "data starts after end of smb"); cFYI(1, "data starts after end of smb");
return -EINVAL; return -EINVAL;
} else if (data_count + *ppdata > end_of_smb) { } 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), *ppdata, data_count, (data_count + *ppdata),
end_of_smb, pSMBr); end_of_smb, pSMBr);
return -EINVAL; return -EINVAL;
@ -3304,7 +3304,7 @@ CIFSSMBQFileInfo(const int xid, struct cifsTconInfo *tcon,
rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
(struct smb_hdr *) pSMBr, &bytes_returned, 0); (struct smb_hdr *) pSMBr, &bytes_returned, 0);
if (rc) { if (rc) {
cFYI(1, ("Send error in QPathInfo = %d", rc)); cFYI(1, "Send error in QPathInfo = %d", rc);
} else { /* decode response */ } else { /* decode response */
rc = validate_t2((struct smb_t2_rsp *)pSMBr); rc = validate_t2((struct smb_t2_rsp *)pSMBr);
@ -3472,14 +3472,14 @@ CIFSSMBUnixQFileInfo(const int xid, struct cifsTconInfo *tcon,
rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
(struct smb_hdr *) pSMBr, &bytes_returned, 0); (struct smb_hdr *) pSMBr, &bytes_returned, 0);
if (rc) { if (rc) {
cFYI(1, ("Send error in QPathInfo = %d", rc)); cFYI(1, "Send error in QPathInfo = %d", rc);
} else { /* decode response */ } else { /* decode response */
rc = validate_t2((struct smb_t2_rsp *)pSMBr); rc = validate_t2((struct smb_t2_rsp *)pSMBr);
if (rc || (pSMBr->ByteCount < sizeof(FILE_UNIX_BASIC_INFO))) { 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 " "Unix Extensions can be disabled on mount "
"by specifying the nosfu mount option.")); "by specifying the nosfu mount option.");
rc = -EIO; /* bad smb */ rc = -EIO; /* bad smb */
} else { } else {
__u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset); __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
@ -4037,7 +4037,7 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
data_end = (char *)(&(pSMBr->PathConsumed)) + data_end = (char *)(&(pSMBr->PathConsumed)) +
le16_to_cpu(pSMBr->t2.DataCount); le16_to_cpu(pSMBr->t2.DataCount);
cFYI(1, "num_referrals: %d dfs flags: 0x%x ... \n", cFYI(1, "num_referrals: %d dfs flags: 0x%x ...\n",
*num_of_nodes, *num_of_nodes,
le32_to_cpu(pSMBr->DFSFlags)); le32_to_cpu(pSMBr->DFSFlags));

12
fs/cifs/file.c
View File

@ -3,7 +3,7 @@
* *
* vfs operations that deal with files * 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) * Author(s): Steve French (sfrench@us.ibm.com)
* Jeremy Allison (jra@samba.org) * Jeremy Allison (jra@samba.org)
* *
@ -855,9 +855,9 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
0 /* wait flag */); 0 /* wait flag */);
pfLock->fl_type = F_RDLCK; pfLock->fl_type = F_RDLCK;
if (rc != 0) if (rc != 0)
cERROR(1, ("Error unlocking " cERROR(1, "Error unlocking "
"previously locked range %d " "previously locked range %d "
"during test of lock", rc)); "during test of lock", rc);
rc = 0; rc = 0;
} else { } else {
pfLock->fl_type = F_WRLCK; pfLock->fl_type = F_WRLCK;
@ -1709,7 +1709,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)
unsigned int rpages = 0; unsigned int rpages = 0;
int rc = 0; int rc = 0;
cFYI(1, "sync page %p",page); cFYI(1, "sync page %p", page);
mapping = page->mapping; mapping = page->mapping;
if (!mapping) if (!mapping)
return 0; return 0;
@ -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); cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
pTcon = cifs_sb->tcon; 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; ) { for (i = 0; i < num_pages; ) {
unsigned contig_pages; unsigned contig_pages;
struct page *tmp_page; struct page *tmp_page;
@ -2083,7 +2083,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
} }
} else { } else {
cFYI(1, "No bytes read (%d) at offset %lld . " cFYI(1, "No bytes read (%d) at offset %lld . "
"Cleaning remaining pages from readahead list", "Cleaning remaining pages from readahead list",
bytes_read, offset); bytes_read, offset);
/* BB turn off caching and do new lookup on /* BB turn off caching and do new lookup on
file size at server? */ file size at server? */

22
fs/cifs/inode.c
View File

@ -1,7 +1,7 @@
/* /*
* fs/cifs/inode.c * 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) * Author(s): Steve French (sfrench@us.ibm.com)
* *
* This library is free software; you can redistribute it and/or modify * 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); 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) { 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; return;
} }
/* don't bother with revalidation if we have an oplock */ /* don't bother with revalidation if we have an oplock */
if (cifs_i->clientCanCacheRead) { if (cifs_i->clientCanCacheRead) {
cFYI(1, ("%s: inode %llu is oplocked", __func__, cFYI(1, "%s: inode %llu is oplocked", __func__,
cifs_i->uniqueid)); cifs_i->uniqueid);
return; return;
} }
/* revalidate if mtime or size have changed */ /* revalidate if mtime or size have changed */
if (timespec_equal(&inode->i_mtime, &fattr->cf_mtime) && if (timespec_equal(&inode->i_mtime, &fattr->cf_mtime) &&
cifs_i->server_eof == fattr->cf_eof) { cifs_i->server_eof == fattr->cf_eof) {
cFYI(1, ("%s: inode %llu is unchanged", __func__, cFYI(1, "%s: inode %llu is unchanged", __func__,
cifs_i->uniqueid)); cifs_i->uniqueid);
return; return;
} }
cFYI(1, ("%s: invalidating inode %llu mapping", __func__, cFYI(1, "%s: invalidating inode %llu mapping", __func__,
cifs_i->uniqueid)); cifs_i->uniqueid);
cifs_i->invalid_mapping = true; cifs_i->invalid_mapping = true;
} }
@ -1577,9 +1577,9 @@ int cifs_revalidate_dentry(struct dentry *dentry)
goto check_inval; 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, "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) if (CIFS_SB(sb)->tcon->unix_ext)
rc = cifs_get_inode_info_unix(&inode, full_path, sb, xid); rc = cifs_get_inode_info_unix(&inode, full_path, sb, xid);