diff options
| author | majianpeng <majianpeng@gmail.com> | 2013-08-21 15:02:51 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 12:24:25 -0800 |
| commit | 30379f4553bae684a928c6bdd9dc606fd0ef6093 (patch) | |
| tree | 01f0fbcf51a602ae65f2e0760554377c5cfb0245 /fs/ceph | |
| parent | 533bc2950e085ee99225655f60276760c00af31f (diff) | |
| download | linux-3.10-30379f4553bae684a928c6bdd9dc606fd0ef6093.tar.gz linux-3.10-30379f4553bae684a928c6bdd9dc606fd0ef6093.tar.bz2 linux-3.10-30379f4553bae684a928c6bdd9dc606fd0ef6093.zip | |
ceph: allow sync_read/write return partial successed size of read/write.
commit ee7289bfadda5f4ef60884547ebc9989c8fb314a upstream.
For sync_read/write, it may do multi stripe operations.If one of those
met erro, we return the former successed size rather than a error value.
There is a exception for write-operation met -EOLDSNAPC.If this occur,we
retry the whole write again.
Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 1ac0a59867d..5de16f5ac7e 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -373,7 +373,7 @@ more: goto more; } - if (ret >= 0) { + if (read > 0) { ret = read; /* did we bounce off eof? */ if (pos + left > inode->i_size) @@ -611,6 +611,8 @@ out: if (check_caps) ceph_check_caps(ceph_inode(inode), CHECK_CAPS_AUTHONLY, NULL); + } else if (ret != -EOLDSNAPC && written > 0) { + ret = written; } return ret; } |