diff options
| author | Long Li <longli@microsoft.com> | 2018-12-16 23:41:07 +0100 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2018-12-24 05:42:48 +0100 |
| commit | 54e94ff94eac887ddb59cfd46b18896da5695e35 (patch) | |
| tree | 3189cb084b3fba47f8bdf7b65478f1527e7b6a07 /fs/cifs | |
| parent | CIFS: use the correct length when pinning memory for direct I/O for write (diff) | |
| download | linux-54e94ff94eac887ddb59cfd46b18896da5695e35.tar.xz linux-54e94ff94eac887ddb59cfd46b18896da5695e35.zip | |
CIFS: return correct errors when pinning memory failed for direct I/O
When pinning memory failed, we should return the correct error code and
rewind the SMB credits.
Reported-by: Murphy Zhou <jencce.kernel@gmail.com>
Signed-off-by: Long Li <longli@microsoft.com>
Cc: stable@vger.kernel.org
Cc: Murphy Zhou <jencce.kernel@gmail.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/file.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 179991435777..c23bf9da93d2 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2632,6 +2632,9 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from, result, from->type, from->iov_offset, from->count); dump_stack(); + + rc = result; + add_credits_and_wake_if(server, credits, 0); break; } cur_len = (size_t)result; @@ -3315,13 +3318,16 @@ 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 (cur_len=%zd)" + "couldn't get user pages (rc=%zd)" " iter type %d" " iov_offset %zd count %zd\n", result, direct_iov.type, direct_iov.iov_offset, direct_iov.count); dump_stack(); + + rc = result; + add_credits_and_wake_if(server, credits, 0); break; } cur_len = (size_t)result; |