|
@@ -2544,7 +2544,7 @@ static void bi_complete(struct bio *bio, int error)
|
|
|
/* FIXME!! we need to try to merge to left or right after zero-out */
|
|
|
static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
|
|
|
{
|
|
|
- int ret = -EIO;
|
|
|
+ int ret;
|
|
|
struct bio *bio;
|
|
|
int blkbits, blocksize;
|
|
|
sector_t ee_pblock;
|
|
@@ -2568,6 +2568,9 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
|
|
|
len = ee_len;
|
|
|
|
|
|
bio = bio_alloc(GFP_NOIO, len);
|
|
|
+ if (!bio)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
bio->bi_sector = ee_pblock;
|
|
|
bio->bi_bdev = inode->i_sb->s_bdev;
|
|
|
|
|
@@ -2595,17 +2598,15 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
|
|
|
submit_bio(WRITE, bio);
|
|
|
wait_for_completion(&event);
|
|
|
|
|
|
- if (test_bit(BIO_UPTODATE, &bio->bi_flags))
|
|
|
- ret = 0;
|
|
|
- else {
|
|
|
- ret = -EIO;
|
|
|
- break;
|
|
|
+ if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) {
|
|
|
+ bio_put(bio);
|
|
|
+ return -EIO;
|
|
|
}
|
|
|
bio_put(bio);
|
|
|
ee_len -= done;
|
|
|
ee_pblock += done << (blkbits - 9);
|
|
|
}
|
|
|
- return ret;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
#define EXT4_EXT_ZERO_LEN 7
|