Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b12b813 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: ratelimit the IO errors"

parents 586788d0 3413c7f0

block/blk-core.c

+5 −3
Original line number Diff line number Diff line
@@ -2001,7 +2001,8 @@ static inline int blk_partition_remap(struct bio *bio) 
		trace_block_bio_remap(bio->bi_disk->queue, bio, part_devt(p),

				bio->bi_iter.bi_sector - p->start_sect);

	} else {

		printk("%s: fail for partition %d\n", __func__, bio->bi_partno);

		printk_ratelimited("%s: fail for partition %d\n",

			__func__, bio->bi_partno);

		ret = -EIO;

	}

	rcu_read_unlock();
@@ -2053,7 +2054,7 @@ generic_make_request_checks(struct bio *bio) 


	q = bio->bi_disk->queue;

	if (unlikely(!q)) {

		printk(KERN_ERR

		printk_ratelimited(KERN_ERR

		       "generic_make_request: Trying to access "

			"nonexistent block-device %s (%Lu)\n",

			bio_devname(bio, b), (long long)bio->bi_iter.bi_sector);
@@ -2632,7 +2633,8 @@ struct request *blk_peek_request(struct request_queue *q) 
			__blk_end_request_all(rq, ret == BLKPREP_INVALID ?

					BLK_STS_TARGET : BLK_STS_IOERR);

		} else {

			printk(KERN_ERR "%s: bad return=%d\n", __func__, ret);

			printk_ratelimited(KERN_ERR "%s: bad return=%d\n",

				__func__, ret);

			break;

		}

	}

fs/fat/fatent.c

+5 −3
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ static int fat12_ent_bread(struct super_block *sb, struct fat_entry *fatent, 
err_brelse:

	brelse(bhs[0]);

err:

	fat_msg(sb, KERN_ERR, "FAT read failed (blocknr %llu)", (llu)blocknr);

	fat_msg_ratelimit(sb, KERN_ERR, "FAT read failed (blocknr %llu)",

		(llu)blocknr);

	return -EIO;

}
@@ -105,7 +106,8 @@ static int fat_ent_bread(struct super_block *sb, struct fat_entry *fatent, 
	fatent->fat_inode = MSDOS_SB(sb)->fat_inode;

	fatent->bhs[0] = sb_bread(sb, blocknr);

	if (!fatent->bhs[0]) {

		fat_msg(sb, KERN_ERR, "FAT read failed (blocknr %llu)",

		fat_msg_ratelimit(sb, KERN_ERR,

			"FAT read failed (blocknr %llu)",

			(llu)blocknr);

		return -EIO;

	}

fs/fat/inode.c

+4 −6
Original line number Diff line number Diff line
@@ -625,10 +625,8 @@ static void fat_free_eofblocks(struct inode *inode) 
		 */

		err = __fat_write_inode(inode, inode_needs_sync(inode));

		if (err) {

			fat_msg(inode->i_sb, KERN_WARNING, "Failed to "

					"update on disk inode for unused "

					"fallocated blocks, inode could be "

					"corrupted. Please run fsck");

			fat_msg_ratelimit(inode->i_sb, KERN_WARNING,

				"Failed to update on disk inode for unused fallocated blocks, inode could be corrupted. Please run fsck");

		}



	}
@@ -672,7 +670,7 @@ static void fat_set_state(struct super_block *sb, 


	bh = sb_bread(sb, 0);

	if (bh == NULL) {

		fat_msg(sb, KERN_ERR, "unable to read boot sector "

		fat_msg_ratelimit(sb, KERN_ERR, "unable to read boot sector "

			"to mark fs as dirty");

		return;

	}
@@ -851,7 +849,7 @@ static int __fat_write_inode(struct inode *inode, int wait) 
	fat_get_blknr_offset(sbi, i_pos, &blocknr, &offset);

	bh = sb_bread(sb, blocknr);

	if (!bh) {

		fat_msg(sb, KERN_ERR, "unable to read inode block "

		fat_msg_ratelimit(sb, KERN_ERR, "unable to read inode block "

		       "for updating (i_pos %lld)", i_pos);

		return -EIO;

	}

fs/fat/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int fat_clusters_flush(struct super_block *sb) 


	bh = sb_bread(sb, sbi->fsinfo_sector);

	if (bh == NULL) {

		fat_msg(sb, KERN_ERR, "bread failed in fat_clusters_flush");

		fat_msg_ratelimit(sb, KERN_ERR, "bread failed in %s", __func__);

		return -EIO;

	}