ceph: fix ENOENT logic in striped_read
authorSage Weil <sage@newdream.net>
Wed, 8 Jun 2011 03:40:35 +0000 (20:40 -0700)
committerSage Weil <sage@newdream.net>
Wed, 8 Jun 2011 04:34:16 +0000 (21:34 -0700)
Getting ENOENT is equivalent to reading 0 bytes.  Make that correction
before setting up the hit_stripe and was_short flags.

Fixes the following case:
 dd if=/dev/zero of=/mnt/fs_depot/dd3 bs=1 seek=1048576 count=0
 dd if=/mnt/fs_depot/dd3 of=/root/ddout1 skip=8 bs=500 count=2 iflag=direct

Reported-by: Henry C Chang <henry.cy.chang@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>
fs/ceph/file.c

index b654f403139e1896cce8aff1f94c57fd27ee2ee0..9542f07d0b9306774e7172afed25b6f809503c06 100644 (file)
@@ -318,10 +318,10 @@ more:
                                  ci->i_truncate_seq,
                                  ci->i_truncate_size,
                                  page_pos, pages_left, page_align);
-       hit_stripe = this_len < left;
-       was_short = ret >= 0 && ret < this_len;
        if (ret == -ENOENT)
                ret = 0;
+       hit_stripe = this_len < left;
+       was_short = ret >= 0 && ret < this_len;
        dout("striped_read %llu~%u (read %u) got %d%s%s\n", pos, left, read,
             ret, hit_stripe ? " HITSTRIPE" : "", was_short ? " SHORT" : "");