Merge tag 'asoc-v5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v5.1

Lots and lots of new drivers so far, a highlight being the MediaTek
BTCVSD which is a driver for a Bluetooth radio chip - the first such
driver we've had upstream.  Hopefully we will soon also see a baseband
with an upstream driver!

 - Support for only powering up channels that are actively being used.
 - Quite a few improvements to simplify the generic card drivers,
   especially the merge of the SCU cards into the main generic drivers.
 - Lots of fixes for probing on Intel systems, trying to rationalize
   things to look more standard from a framework point of view.
 - New drivers for Asahi Kasei Microdevices AK4497, Cirrus Logic CS4341,
   Google ChromeOS embedded controllers, Ingenic JZ4725B, MediaTek
   BTCVSD, MT8183 and MT6358, NXP MICFIL, Rockchip RK3328, Spreadtrum
   DMA controllers, Qualcomm WCD9335, Xilinx S/PDIF and PCM formatters.

1 files changed, 35 insertions, 10 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index e3e3a7550205..2c7689f3998d 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -733,7 +733,8 @@ reopen_success:
 
         if (can_flush) {
                 rc = filemap_write_and_wait(inode->i_mapping);
-                mapping_set_error(inode->i_mapping, rc);
+                if (!is_interrupt_error(rc))
+                        mapping_set_error(inode->i_mapping, rc);
 
                 if (tcon->unix_ext)
                         rc = cifs_get_inode_info_unix(&inode, full_path,
@@ -1132,14 +1133,18 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
 
         /*
          * Accessing maxBuf is racy with cifs_reconnect - need to store value
-         * and check it for zero before using.
+         * and check it before using.
          */
         max_buf = tcon->ses->server->maxBuf;
-        if (!max_buf) {
+        if (max_buf < (sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE))) {
                 free_xid(xid);
                 return -EINVAL;
         }
 
+        BUILD_BUG_ON(sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE) >
+                     PAGE_SIZE);
+        max_buf = min_t(unsigned int, max_buf - sizeof(struct smb_hdr),
+                        PAGE_SIZE);
         max_num = (max_buf - sizeof(struct smb_hdr)) /
                                                 sizeof(LOCKING_ANDX_RANGE);
         buf = kcalloc(max_num, sizeof(LOCKING_ANDX_RANGE), GFP_KERNEL);
@@ -1472,12 +1477,16 @@ cifs_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock,
 
         /*
          * Accessing maxBuf is racy with cifs_reconnect - need to store value
-         * and check it for zero before using.
+         * and check it before using.
          */
         max_buf = tcon->ses->server->maxBuf;
-        if (!max_buf)
+        if (max_buf < (sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE)))
                 return -EINVAL;
 
+        BUILD_BUG_ON(sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE) >
+                     PAGE_SIZE);
+        max_buf = min_t(unsigned int, max_buf - sizeof(struct smb_hdr),
+                        PAGE_SIZE);
         max_num = (max_buf - sizeof(struct smb_hdr)) /
                                                 sizeof(LOCKING_ANDX_RANGE);
         buf = kcalloc(max_num, sizeof(LOCKING_ANDX_RANGE), GFP_KERNEL);
@@ -2110,6 +2119,7 @@ static int cifs_writepages(struct address_space *mapping,
         pgoff_t end, index;
         struct cifs_writedata *wdata;
         int rc = 0;
+        int saved_rc = 0;
         unsigned int xid;
 
         /*
@@ -2138,8 +2148,10 @@ retry:
 
                 rc = server->ops->wait_mtu_credits(server, cifs_sb->wsize,
                                                    &wsize, &credits);
-                if (rc)
+                if (rc != 0) {
+                        done = true;
                         break;
+                }
 
                 tofind = min((wsize / PAGE_SIZE) - 1, end - index) + 1;
 
@@ -2147,6 +2159,7 @@ retry:
                                                   &found_pages);
                 if (!wdata) {
                         rc = -ENOMEM;
+                        done = true;
                         add_credits_and_wake_if(server, credits, 0);
                         break;
                 }
@@ -2175,7 +2188,7 @@ retry:
                 if (rc != 0) {
                         add_credits_and_wake_if(server, wdata->credits, 0);
                         for (i = 0; i < nr_pages; ++i) {
-                                if (rc == -EAGAIN)
+                                if (is_retryable_error(rc))
                                         redirty_page_for_writepage(wbc,
                                                            wdata->pages[i]);
                                 else
@@ -2183,7 +2196,7 @@ retry:
                                 end_page_writeback(wdata->pages[i]);
                                 put_page(wdata->pages[i]);
                         }
-                        if (rc != -EAGAIN)
+                        if (!is_retryable_error(rc))
                                 mapping_set_error(mapping, rc);
                 }
                 kref_put(&wdata->refcount, cifs_writedata_release);
@@ -2193,6 +2206,15 @@ retry:
                         continue;
                 }
 
+                /* Return immediately if we received a signal during writing */
+                if (is_interrupt_error(rc)) {
+                        done = true;
+                        break;
+                }
+
+                if (rc != 0 && saved_rc == 0)
+                        saved_rc = rc;
+
                 wbc->nr_to_write -= nr_pages;
                 if (wbc->nr_to_write <= 0)
                         done = true;
@@ -2210,6 +2232,9 @@ retry:
                 goto retry;
         }
 
+        if (saved_rc != 0)
+                rc = saved_rc;
+
         if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
                 mapping->writeback_index = index;
 
@@ -2242,8 +2267,8 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc)
         set_page_writeback(page);
 retry_write:
         rc = cifs_partialpagewrite(page, 0, PAGE_SIZE);
-        if (rc == -EAGAIN) {
-                if (wbc->sync_mode == WB_SYNC_ALL)
+        if (is_retryable_error(rc)) {
+                if (wbc->sync_mode == WB_SYNC_ALL && rc == -EAGAIN)
                         goto retry_write;
                 redirty_page_for_writepage(wbc, page);
         } else if (rc != 0) {