aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/file.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-07-12 20:33:32 -0400
committerSteve French <sfrench@us.ibm.com>2007-07-12 20:33:32 -0400
commit50c2f75388727018c3c357454a247072915a9e3f (patch)
treee7c7cd30f1adee51be7af8bda5e937df5c899bc6 /fs/cifs/file.c
parent7521a3c566dda7bb09576975324fc0a08a79ad14 (diff)
[CIFS] whitespace/formatting fixes
This should be the last big batch of whitespace/formatting fixes. checkpatch warnings for the cifs directory are down about 90% and many of the remaining ones are harder to remove or make the code harder to read. Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r--fs/cifs/file.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index d83eca4231e7..b67f1da020be 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -189,7 +189,7 @@ int cifs_open(struct inode *inode, struct file *file)
189 189
190 /* needed for writepage */ 190 /* needed for writepage */
191 pCifsFile->pfile = file; 191 pCifsFile->pfile = file;
192 192
193 file->private_data = pCifsFile; 193 file->private_data = pCifsFile;
194 break; 194 break;
195 } 195 }
@@ -378,7 +378,7 @@ static int cifs_reopen_file(struct file *file, int can_flush)
378 rc = -EBADF; 378 rc = -EBADF;
379 goto reopen_error_exit; 379 goto reopen_error_exit;
380 } 380 }
381 381
382 cifs_sb = CIFS_SB(inode->i_sb); 382 cifs_sb = CIFS_SB(inode->i_sb);
383 pTcon = cifs_sb->tcon; 383 pTcon = cifs_sb->tcon;
384 384
@@ -735,7 +735,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
735 posix_lock_type = CIFS_RDLCK; 735 posix_lock_type = CIFS_RDLCK;
736 else 736 else
737 posix_lock_type = CIFS_WRLCK; 737 posix_lock_type = CIFS_WRLCK;
738 738
739 if (numUnlock == 1) 739 if (numUnlock == 1)
740 posix_lock_type = CIFS_UNLCK; 740 posix_lock_type = CIFS_UNLCK;
741 741
@@ -810,7 +810,7 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,
810 if (file->private_data == NULL) 810 if (file->private_data == NULL)
811 return -EBADF; 811 return -EBADF;
812 open_file = (struct cifsFileInfo *) file->private_data; 812 open_file = (struct cifsFileInfo *) file->private_data;
813 813
814 xid = GetXid(); 814 xid = GetXid();
815 815
816 if (*poffset > file->f_path.dentry->d_inode->i_size) 816 if (*poffset > file->f_path.dentry->d_inode->i_size)
@@ -909,7 +909,7 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
909 if (file->private_data == NULL) 909 if (file->private_data == NULL)
910 return -EBADF; 910 return -EBADF;
911 open_file = (struct cifsFileInfo *)file->private_data; 911 open_file = (struct cifsFileInfo *)file->private_data;
912 912
913 xid = GetXid(); 913 xid = GetXid();
914 914
915 if (*poffset > file->f_path.dentry->d_inode->i_size) 915 if (*poffset > file->f_path.dentry->d_inode->i_size)
@@ -1035,7 +1035,8 @@ struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode)
1035 /* if it fails, try another handle - might be */ 1035 /* if it fails, try another handle - might be */
1036 /* dangerous to hold up writepages with retry */ 1036 /* dangerous to hold up writepages with retry */
1037 if (rc) { 1037 if (rc) {
1038 cFYI(1, ("failed on reopen file in wp")); 1038 cFYI(1,
1039 ("failed on reopen file in wp"));
1039 read_lock(&GlobalSMBSeslock); 1040 read_lock(&GlobalSMBSeslock);
1040 /* can not use this handle, no write 1041 /* can not use this handle, no write
1041 pending on this one after all */ 1042 pending on this one after all */
@@ -1136,7 +1137,7 @@ static int cifs_writepages(struct address_space *mapping,
1136 int xid; 1137 int xid;
1137 1138
1138 cifs_sb = CIFS_SB(mapping->host->i_sb); 1139 cifs_sb = CIFS_SB(mapping->host->i_sb);
1139 1140
1140 /* 1141 /*
1141 * If wsize is smaller that the page cache size, default to writing 1142 * If wsize is smaller that the page cache size, default to writing
1142 * one page at a time via cifs_writepage 1143 * one page at a time via cifs_writepage
@@ -1419,7 +1420,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)
1419 1420
1420 cFYI(1, ("Sync file - name: %s datasync: 0x%x", 1421 cFYI(1, ("Sync file - name: %s datasync: 0x%x",
1421 dentry->d_name.name, datasync)); 1422 dentry->d_name.name, datasync));
1422 1423
1423 rc = filemap_fdatawrite(inode->i_mapping); 1424 rc = filemap_fdatawrite(inode->i_mapping);
1424 if (rc == 0) 1425 if (rc == 0)
1425 CIFS_I(inode)->write_behind_rc = 0; 1426 CIFS_I(inode)->write_behind_rc = 0;
@@ -1476,7 +1477,7 @@ int cifs_flush(struct file *file, fl_owner_t id)
1476 rc = filemap_fdatawrite(inode->i_mapping); 1477 rc = filemap_fdatawrite(inode->i_mapping);
1477 if (!rc) /* reset wb rc if we were able to write out dirty pages */ 1478 if (!rc) /* reset wb rc if we were able to write out dirty pages */
1478 CIFS_I(inode)->write_behind_rc = 0; 1479 CIFS_I(inode)->write_behind_rc = 0;
1479 1480
1480 cFYI(1, ("Flush inode %p file %p rc %d", inode, file, rc)); 1481 cFYI(1, ("Flush inode %p file %p rc %d", inode, file, rc));
1481 1482
1482 return rc; 1483 return rc;
@@ -1914,7 +1915,7 @@ int is_size_safe_to_change(struct cifsInodeInfo *cifsInode, __u64 end_of_file)
1914 1915
1915 if (cifsInode) 1916 if (cifsInode)
1916 open_file = find_writable_file(cifsInode); 1917 open_file = find_writable_file(cifsInode);
1917 1918
1918 if (open_file) { 1919 if (open_file) {
1919 struct cifs_sb_info *cifs_sb; 1920 struct cifs_sb_info *cifs_sb;
1920 1921