Merge tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping

[sfrench/cifs-2.6.git] / fs / cifs / cifssmb.c

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 5aca336642c0acd7cafa9d6a7ef3f80b6cfb0ab9..d352da325de34d3c11b6dbb8c6579f6e4f0a216f 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -107,10 +107,10 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon)
        }
        spin_unlock(&tcon->open_file_lock);
 
-       mutex_lock(&tcon->prfid_mutex);
-       tcon->valid_root_fid = false;
-       memset(tcon->prfid, 0, sizeof(struct cifs_fid));
-       mutex_unlock(&tcon->prfid_mutex);
+       mutex_lock(&tcon->crfid.fid_mutex);
+       tcon->crfid.is_valid = false;
+       memset(tcon->crfid.fid, 0, sizeof(struct cifs_fid));
+       mutex_unlock(&tcon->crfid.fid_mutex);
 
        /*
         * BB Add call to invalidate_inodes(sb) for all superblocks mounted
@@ -2077,7 +2077,7 @@ struct cifs_writedata *
 cifs_writedata_alloc(unsigned int nr_pages, work_func_t complete)
 {
        struct page **pages =
-               kzalloc(sizeof(struct page *) * nr_pages, GFP_NOFS);
+               kcalloc(nr_pages, sizeof(struct page *), GFP_NOFS);
        if (pages)
                return cifs_writedata_direct_alloc(pages, complete);