aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/file.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2010-04-21 00:12:10 -0400
committerSteve French <sfrench@us.ibm.com>2010-04-21 00:12:10 -0400
commitf19159dc5ab9ec28c3b8230689101335d98e2d68 (patch)
treedbfe881035d52e3fb578e253a9d27d56cbb09c2f /fs/cifs/file.c
parentb6b38f704a8193daba520493ebdaf7e819962fc8 (diff)
[CIFS] Cleanup various minor breakage in previous cFYI cleanup
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r--fs/cifs/file.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index ed3689e6617c..99897e3562a7 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * vfs operations that deal with files 4 * vfs operations that deal with files
5 * 5 *
6 * Copyright (C) International Business Machines Corp., 2002,2007 6 * Copyright (C) International Business Machines Corp., 2002,2010
7 * Author(s): Steve French (sfrench@us.ibm.com) 7 * Author(s): Steve French (sfrench@us.ibm.com)
8 * Jeremy Allison (jra@samba.org) 8 * Jeremy Allison (jra@samba.org)
9 * 9 *
@@ -855,9 +855,9 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
855 0 /* wait flag */); 855 0 /* wait flag */);
856 pfLock->fl_type = F_RDLCK; 856 pfLock->fl_type = F_RDLCK;
857 if (rc != 0) 857 if (rc != 0)
858 cERROR(1, ("Error unlocking " 858 cERROR(1, "Error unlocking "
859 "previously locked range %d " 859 "previously locked range %d "
860 "during test of lock", rc)); 860 "during test of lock", rc);
861 rc = 0; 861 rc = 0;
862 } else { 862 } else {
863 pfLock->fl_type = F_WRLCK; 863 pfLock->fl_type = F_WRLCK;
@@ -1709,7 +1709,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)
1709 unsigned int rpages = 0; 1709 unsigned int rpages = 0;
1710 int rc = 0; 1710 int rc = 0;
1711 1711
1712 cFYI(1, "sync page %p",page); 1712 cFYI(1, "sync page %p", page);
1713 mapping = page->mapping; 1713 mapping = page->mapping;
1714 if (!mapping) 1714 if (!mapping)
1715 return 0; 1715 return 0;
@@ -1998,7 +1998,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
1998 cifs_sb = CIFS_SB(file->f_path.dentry->d_sb); 1998 cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
1999 pTcon = cifs_sb->tcon; 1999 pTcon = cifs_sb->tcon;
2000 2000
2001 cFYI(DBG2, ("rpages: num pages %d", num_pages)); 2001 cFYI(DBG2, "rpages: num pages %d", num_pages);
2002 for (i = 0; i < num_pages; ) { 2002 for (i = 0; i < num_pages; ) {
2003 unsigned contig_pages; 2003 unsigned contig_pages;
2004 struct page *tmp_page; 2004 struct page *tmp_page;
@@ -2083,7 +2083,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
2083 } 2083 }
2084 } else { 2084 } else {
2085 cFYI(1, "No bytes read (%d) at offset %lld . " 2085 cFYI(1, "No bytes read (%d) at offset %lld . "
2086 "Cleaning remaining pages from readahead list", 2086 "Cleaning remaining pages from readahead list",
2087 bytes_read, offset); 2087 bytes_read, offset);
2088 /* BB turn off caching and do new lookup on 2088 /* BB turn off caching and do new lookup on
2089 file size at server? */ 2089 file size at server? */