aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authormajianpeng <majianpeng@gmail.com>2013-08-21 03:02:51 -0400
committerSage Weil <sage@inktank.com>2013-08-27 15:28:46 -0400
commitee7289bfadda5f4ef60884547ebc9989c8fb314a (patch)
treef835efe5f3a34b276991f5e145b4b723f9cd00d3 /fs/ceph
parent02ae66d8b229708fd94b764f6c17ead1c7741fcf (diff)
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.c4
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:
374 goto more; 374 goto more;
375 } 375 }
376 376
377 if (ret >= 0) { 377 if (read > 0) {
378 ret = read; 378 ret = read;
379 /* did we bounce off eof? */ 379 /* did we bounce off eof? */
380 if (pos + left > inode->i_size) 380 if (pos + left > inode->i_size)
@@ -612,6 +612,8 @@ out:
612 if (check_caps) 612 if (check_caps)
613 ceph_check_caps(ceph_inode(inode), CHECK_CAPS_AUTHONLY, 613 ceph_check_caps(ceph_inode(inode), CHECK_CAPS_AUTHONLY,
614 NULL); 614 NULL);
615 } else if (ret != -EOLDSNAPC && written > 0) {
616 ret = written;
615 } 617 }
616 return ret; 618 return ret;
617} 619}