diff options
| author | Sage Weil <sage@newdream.net> | 2011-06-08 07:40:35 +0400 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-06-08 08:34:16 +0400 |
| commit | 0e98728fa32d338907631349a8cc2afa07c0cb9a (patch) | |
| tree | 589aaa9b8b973194a7185ff92d7a8a6fe9051edb /fs/ceph/file.c | |
| parent | c3cd62839aaa2cdb2b99687c9e44f1b300a4aece (diff) | |
| download | linux-0e98728fa32d338907631349a8cc2afa07c0cb9a.tar.xz | |
ceph: fix ENOENT logic in striped_read
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>
Diffstat (limited to 'fs/ceph/file.c')
| -rw-r--r-- | fs/ceph/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index b654f403139e..9542f07d0b93 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -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" : ""); |