From 28e861b8e04edb6505de29b30daaff0ad20d38be Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Wed, 5 Oct 2005 19:32:49 -0700
Subject: [PATCH] --- yaml --- r: 12061 b: refs/heads/master c:
 dd99cd803d460576cf84f012786ff39814b73f7f h: refs/heads/master i:   12059:
 66ed02df95eda7026fb446df76e3fe35b9fde855 v: v3

---
 [refs]                | 2 +-
 trunk/fs/cifs/file.c  | 5 +++--
 trunk/fs/cifs/inode.c | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ea7551a521d7..1877edce750b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a77118cd5018fec11bf86f6f8d659352ad9a92b
+refs/heads/master: dd99cd803d460576cf84f012786ff39814b73f7f
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index 0f66ae5b694b..39b23f4fa6c3 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -907,9 +907,10 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
 	return total_written;
 }
 
-static struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode)
+struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode)
 {
 	struct cifsFileInfo *open_file;
+	int rc;
 
 	read_lock(&GlobalSMBSeslock);
 	list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
@@ -920,7 +921,7 @@ static struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode)
 		     (open_file->pfile->f_flags & O_WRONLY))) {
 			read_unlock(&GlobalSMBSeslock);
 			if(open_file->invalidHandle) {
-				rc = cifs_reopen_file(cifs_inode->vfs_inode, 
+				rc = cifs_reopen_file(&cifs_inode->vfs_inode, 
 						      open_file->pfile, FALSE);
 				/* if it fails, try another handle - might be */
 				/* dangerous to hold up writepages with retry */
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index 49efdefcff7c..ff4d1cc7c248 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/fs/cifs/inode.c
@@ -962,7 +962,6 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
 	struct cifsTconInfo *pTcon;
 	char *full_path = NULL;
 	int rc = -EACCES;
-	int found = FALSE;
 	struct cifsFileInfo *open_file = NULL;
 	FILE_BASIC_INFO time_buf;
 	int set_time = FALSE;
@@ -970,7 +969,6 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
 	__u64 uid = 0xFFFFFFFFFFFFFFFFULL;
 	__u64 gid = 0xFFFFFFFFFFFFFFFFULL;
 	struct cifsInodeInfo *cifsInode;
-	struct list_head *tmp;
 
 	xid = GetXid();