Revert "LU-5654 osd-ldiskfs: Handle holes in osd_ldiskfs_read()"

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_io.c

diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c
index 8344d4a..9765595 100644 (file)
--- a/lustre/osd-ldiskfs/osd_io.c
+++ b/lustre/osd-ldiskfs/osd_io.c
@@ -1355,21 +1355,15 @@ int osd_ldiskfs_read(struct inode *inode, void *buf, int size, loff_t *offs)
                 boffs = *offs & (blocksize - 1);
                 csize = min(blocksize - boffs, size);
                 bh = ldiskfs_bread(NULL, inode, block, 0, &err);
-               if (err != 0) {
-                       CERROR("%s: can't read %u@%llu on ino %lu: rc = %d\n",
-                              LDISKFS_SB(inode->i_sb)->s_es->s_volume_name,
-                              csize, *offs, inode->i_ino, err);
-                       if (bh != NULL)
-                               brelse(bh);
-                       return err;
-               }
+                if (!bh) {
+                        CERROR("%s: can't read %u@%llu on ino %lu: rc = %d\n",
+                               LDISKFS_SB(inode->i_sb)->s_es->s_volume_name,
+                               csize, *offs, inode->i_ino, err);
+                        return err;
+                }
 
-               if (bh != NULL) {
-                       memcpy(buf, bh->b_data + boffs, csize);
-                       brelse(bh);
-               } else {
-                       memset(buf, 0, csize);
-               }
+                memcpy(buf, bh->b_data + boffs, csize);
+                brelse(bh);
 
                 *offs += csize;
                 buf += csize;