aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-10-05 22:32:49 -0400
committerSteve French <sfrench@us.ibm.com>2005-10-05 22:32:49 -0400
commitdd99cd803d460576cf84f012786ff39814b73f7f (patch)
tree5804212dea596d82bb561624a6e7c868c27bc2f3 /fs/cifs
parent4a77118cd5018fec11bf86f6f8d659352ad9a92b (diff)
[CIFS] cleanup sparse and compile errors in previous fix
Signed-off-by: Steve French (sfrench@us.ibm.com)
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/file.c5
-rw-r--r--fs/cifs/inode.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 0f66ae5b694b..39b23f4fa6c3 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -907,9 +907,10 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
907 return total_written; 907 return total_written;
908} 908}
909 909
910static struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode) 910struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode)
911{ 911{
912 struct cifsFileInfo *open_file; 912 struct cifsFileInfo *open_file;
913 int rc;
913 914
914 read_lock(&GlobalSMBSeslock); 915 read_lock(&GlobalSMBSeslock);
915 list_for_each_entry(open_file, &cifs_inode->openFileList, flist) { 916 list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
@@ -920,7 +921,7 @@ static struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode)
920 (open_file->pfile->f_flags & O_WRONLY))) { 921 (open_file->pfile->f_flags & O_WRONLY))) {
921 read_unlock(&GlobalSMBSeslock); 922 read_unlock(&GlobalSMBSeslock);
922 if(open_file->invalidHandle) { 923 if(open_file->invalidHandle) {
923 rc = cifs_reopen_file(cifs_inode->vfs_inode, 924 rc = cifs_reopen_file(&cifs_inode->vfs_inode,
924 open_file->pfile, FALSE); 925 open_file->pfile, FALSE);
925 /* if it fails, try another handle - might be */ 926 /* if it fails, try another handle - might be */
926 /* dangerous to hold up writepages with retry */ 927 /* dangerous to hold up writepages with retry */
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 49efdefcff7c..ff4d1cc7c248 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -962,7 +962,6 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
962 struct cifsTconInfo *pTcon; 962 struct cifsTconInfo *pTcon;
963 char *full_path = NULL; 963 char *full_path = NULL;
964 int rc = -EACCES; 964 int rc = -EACCES;
965 int found = FALSE;
966 struct cifsFileInfo *open_file = NULL; 965 struct cifsFileInfo *open_file = NULL;
967 FILE_BASIC_INFO time_buf; 966 FILE_BASIC_INFO time_buf;
968 int set_time = FALSE; 967 int set_time = FALSE;
@@ -970,7 +969,6 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
970 __u64 uid = 0xFFFFFFFFFFFFFFFFULL; 969 __u64 uid = 0xFFFFFFFFFFFFFFFFULL;
971 __u64 gid = 0xFFFFFFFFFFFFFFFFULL; 970 __u64 gid = 0xFFFFFFFFFFFFFFFFULL;
972 struct cifsInodeInfo *cifsInode; 971 struct cifsInodeInfo *cifsInode;
973 struct list_head *tmp;
974 972
975 xid = GetXid(); 973 xid = GetXid();
976 974