cifs: multichannel: always zero struct cifs_io_parms

[linux-2.6-microblaze.git] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 0b1528e..de130f3 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -857,7 +857,7 @@ cifs_reopen_persistent_handles(struct cifs_tcon *tcon)
 
        tcon->need_reopen_files = false;
 
-       cifs_dbg(FYI, "Reopen persistent handles");
+       cifs_dbg(FYI, "Reopen persistent handles\n");
        INIT_LIST_HEAD(&tmp_list);
 
        /* list all files open on tree connection, reopen resilient handles  */
@@ -1853,7 +1853,7 @@ cifs_write(struct cifsFileInfo *open_file, __u32 pid, const char *write_data,
        unsigned int xid;
        struct dentry *dentry = open_file->dentry;
        struct cifsInodeInfo *cifsi = CIFS_I(d_inode(dentry));
-       struct cifs_io_parms io_parms;
+       struct cifs_io_parms io_parms = {0};
 
        cifs_dbg(FYI, "write %zd bytes to offset %lld of %pd\n",
                 write_size, *offset, dentry);
@@ -2056,7 +2056,7 @@ find_writable_file(struct cifsInodeInfo *cifs_inode, int flags)
 
        rc = cifs_get_writable_file(cifs_inode, flags, &cfile);
        if (rc)
-               cifs_dbg(FYI, "couldn't find writable handle rc=%d", rc);
+               cifs_dbg(FYI, "Couldn't find writable handle rc=%d\n", rc);
 
        return cfile;
 }
@@ -2923,11 +2923,9 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from,
                                from, &pagevec, cur_len, &start);
                        if (result < 0) {
                                cifs_dbg(VFS,
-                                       "direct_writev couldn't get user pages "
-                                       "(rc=%zd) iter type %d iov_offset %zd "
-                                       "count %zd\n",
-                                       result, iov_iter_type(from),
-                                       from->iov_offset, from->count);
+                                        "direct_writev couldn't get user pages (rc=%zd) iter type %d iov_offset %zd count %zd\n",
+                                        result, iov_iter_type(from),
+                                        from->iov_offset, from->count);
                                dump_stack();
 
                                rc = result;
@@ -3654,12 +3652,10 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file,
                                        cur_len, &start);
                        if (result < 0) {
                                cifs_dbg(VFS,
-                                       "couldn't get user pages (rc=%zd)"
-                                       " iter type %d"
-                                       " iov_offset %zd count %zd\n",
-                                       result, iov_iter_type(&direct_iov),
-                                       direct_iov.iov_offset,
-                                       direct_iov.count);
+                                        "Couldn't get user pages (rc=%zd) iter type %d iov_offset %zd count %zd\n",
+                                        result, iov_iter_type(&direct_iov),
+                                        direct_iov.iov_offset,
+                                        direct_iov.count);
                                dump_stack();
 
                                rc = result;
@@ -4018,7 +4014,7 @@ cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset)
        unsigned int xid;
        char *cur_offset;
        struct cifsFileInfo *open_file;
-       struct cifs_io_parms io_parms;
+       struct cifs_io_parms io_parms = {0};
        int buf_type = CIFS_NO_BUFFER;
        __u32 pid;
 
@@ -4060,7 +4056,7 @@ cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset)
                         * than it negotiated since it will refuse the read
                         * then.
                         */
-                       if ((tcon->ses) && !(tcon->ses->capabilities &
+                       if (!(tcon->ses->capabilities &
                                tcon->ses->server->vals->cap_large_files)) {
                                current_read_size = min_t(uint,
                                        current_read_size, CIFSMaxBufSize);
@@ -4828,7 +4824,7 @@ static int cifs_swap_activate(struct swap_info_struct *sis,
        }
        *span = sis->pages;
 
-       printk_once(KERN_WARNING "Swap support over SMB3 is experimental\n");
+       pr_warn_once("Swap support over SMB3 is experimental\n");
 
        /*
         * TODO: consider adding ACL (or documenting how) to prevent other