Merge branch 'for-5.4/wacom' into for-linus

[linux.git] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 7037a137fa5330c807da19a91acd054d76ad031a..97090693d18278045f5447fcf4de4cf162edaefb 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -338,10 +338,12 @@ cifs_new_fileinfo(struct cifs_fid *fid, struct file *file,
        atomic_inc(&tcon->num_local_opens);
 
        /* if readable file instance put first in list*/
+       spin_lock(&cinode->open_file_lock);
        if (file->f_mode & FMODE_READ)
                list_add(&cfile->flist, &cinode->openFileList);
        else
                list_add_tail(&cfile->flist, &cinode->openFileList);
+       spin_unlock(&cinode->open_file_lock);
        spin_unlock(&tcon->open_file_lock);
 
        if (fid->purge_cache)
@@ -413,7 +415,9 @@ void _cifsFileInfo_put(struct cifsFileInfo *cifs_file, bool wait_oplock_handler)
        cifs_add_pending_open_locked(&fid, cifs_file->tlink, &open);
 
        /* remove it from the lists */
+       spin_lock(&cifsi->open_file_lock);
        list_del(&cifs_file->flist);
+       spin_unlock(&cifsi->open_file_lock);
        list_del(&cifs_file->tlist);
        atomic_dec(&tcon->num_local_opens);
 
@@ -1950,9 +1954,9 @@ cifs_get_writable_file(struct cifsInodeInfo *cifs_inode, bool fsuid_only,
                        return 0;
                }
 
-               spin_lock(&tcon->open_file_lock);
+               spin_lock(&cifs_inode->open_file_lock);
                list_move_tail(&inv_file->flist, &cifs_inode->openFileList);
-               spin_unlock(&tcon->open_file_lock);
+               spin_unlock(&cifs_inode->open_file_lock);
                cifsFileInfo_put(inv_file);
                ++refind;
                inv_file = NULL;
@@ -2443,7 +2447,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end,
        rc = file_write_and_wait_range(file, start, end);
        if (rc)
                return rc;
-       inode_lock(inode);
 
        xid = get_xid();
 
@@ -2468,7 +2471,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end,
        }
 
        free_xid(xid);
-       inode_unlock(inode);
        return rc;
 }
 
@@ -2480,12 +2482,10 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
        struct TCP_Server_Info *server;
        struct cifsFileInfo *smbfile = file->private_data;
        struct cifs_sb_info *cifs_sb = CIFS_FILE_SB(file);
-       struct inode *inode = file->f_mapping->host;
 
        rc = file_write_and_wait_range(file, start, end);
        if (rc)
                return rc;
-       inode_lock(inode);
 
        xid = get_xid();
 
@@ -2502,7 +2502,6 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
        }
 
        free_xid(xid);
-       inode_unlock(inode);
        return rc;
 }
 
@@ -3221,7 +3220,9 @@ cifs_read_allocate_pages(struct cifs_readdata *rdata, unsigned int nr_pages)
        }
 
        if (rc) {
-               for (i = 0; i < nr_pages; i++) {
+               unsigned int nr_page_failed = i;
+
+               for (i = 0; i < nr_page_failed; i++) {
                        put_page(rdata->pages[i]);
                        rdata->pages[i] = NULL;
                }