Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd99cd80 authored by Steve French's avatar Steve French
Browse files

[CIFS] cleanup sparse and compile errors in previous fix 



Signed-off-by: default avatarSteve French <(sfrench@us.ibm.com)>
parent 4a77118c

fs/cifs/file.c

+3 −2
Original line number Diff line number Diff line
@@ -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 */

fs/cifs/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -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();