ceph: allow sync_read/write return partial successed size of read/write.
authormajianpeng <majianpeng@gmail.com>
Wed, 21 Aug 2013 07:02:51 +0000 (15:02 +0800)
committerSage Weil <sage@inktank.com>
Tue, 27 Aug 2013 19:28:46 +0000 (12:28 -0700)
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>
fs/ceph/file.c

index 98b9035b2e810d0cbfc9eb1266fbdc292555e12e..20d0222c2e76b892d933a841d26ed6912d4c84f9 100644 (file)
@@ -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;
 }