diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
| commit | d831fd1b46d04e5c8c8a0431c321578d25852695 (patch) | |
| tree | 53a685712d0f0debe66de80c1f0a5e545d0de7e2 /fs/cifs/file.c | |
| parent | c95c4e2a6bb8d44f9a8f59eadd99a9a615c53112 (diff) | |
| parent | 339f8f37f0203884332585e38c06536c8477d475 (diff) | |
Merge tag 'v3.10.55' into linux-linaro-lsklsk-v3.10-14.09
This is the 3.10.55 stable release
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 8b0c656f2ab2..97b03895ac8c 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2809,7 +2809,7 @@ cifs_uncached_read_into_pages(struct TCP_Server_Info *server, total_read += result; } - return total_read > 0 ? total_read : result; + return total_read > 0 && result != -EAGAIN ? total_read : result; } static ssize_t @@ -3232,7 +3232,7 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server, total_read += result; } - return total_read > 0 ? total_read : result; + return total_read > 0 && result != -EAGAIN ? total_read : result; } static int cifs_readpages(struct file *file, struct address_space *mapping, |