diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-17 11:19:07 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-17 11:19:07 -0700 |
| commit | 72df321f602520b6ea09f47a71b6795efc0a83c8 (patch) | |
| tree | e32e2d9dff3d90f49e95f0bfa61860eac0dc3ed3 /fs/cifs/file.c | |
| parent | 1414ffefd32b80f827a697505a9eede86978ebbb (diff) | |
| parent | 0111d0f13469831266d716e3b50d580a3e25cff9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.09
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 87c4dd072cde..8175b18df819 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2844,7 +2844,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 @@ -3267,7 +3267,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, |