diff options
| author | majianpeng <majianpeng@gmail.com> | 2013-08-21 09:02:51 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-27 21:28:46 +0200 |
| commit | ee7289bfadda5f4ef60884547ebc9989c8fb314a (patch) | |
| tree | f835efe5f3a34b276991f5e145b4b723f9cd00d3 /fs/ceph | |
| parent | ceph: fix bugs about handling short-read for sync read mode. (diff) | |
| download | linux-ee7289bfadda5f4ef60884547ebc9989c8fb314a.tar.xz linux-ee7289bfadda5f4ef60884547ebc9989c8fb314a.zip | |
ceph: allow sync_read/write return partial successed size of read/write.
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>
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 98b9035b2e81..20d0222c2e76 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -374,7 +374,7 @@ more: goto more; } - if (ret >= 0) { + if (read > 0) { ret = read; /* did we bounce off eof? */ if (pos + left > inode->i_size) @@ -612,6 +612,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; } |