Merge tag 'block-5.5-2020-01-10' of git://git.kernel.dk/linux-block (4e4cd21c) · Commits · 戴 / test

block/bio.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -538,6 +538,16 @@ void zero_fill_bio_iter(struct bio *bio, struct bvec_iter start)
		}
		EXPORT_SYMBOL(zero_fill_bio_iter);

		/**
		* bio_truncate - truncate the bio to small size of @new_size
		* @bio: the bio to be truncated
		* @new_size: new size for truncating the bio
		*
		* Description:
		* Truncate the bio to new size of @new_size. If bio_op(bio) is
		* REQ_OP_READ, zero the truncated part. This function should only
		* be used for handling corner cases, such as bio eod.
		*/
		void bio_truncate(struct bio *bio, unsigned new_size)
		{
		struct bio_vec bv;
		@@ -548,7 +558,7 @@ void bio_truncate(struct bio *bio, unsigned new_size)
		if (new_size >= bio->bi_iter.bi_size)
		return;

		if (bio_data_dir(bio) != READ)
		if (bio_op(bio) != REQ_OP_READ)
		goto exit;

		bio_for_each_segment(bv, bio, iter) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,8 @@ static blk_status_t nvme_error_status(u16 status)
		case NVME_SC_CAP_EXCEEDED:
		return BLK_STS_NOSPC;
		case NVME_SC_LBA_RANGE:
		case NVME_SC_CMD_INTERRUPTED:
		case NVME_SC_NS_NOT_READY:
		return BLK_STS_TARGET;
		case NVME_SC_BAD_ATTRIBUTES:
		case NVME_SC_ONCS_NOT_SUPPORTED:

+11 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,16 @@ u32 nvmet_get_log_page_len(struct nvme_command *cmd)
		return len;
		}

		static u32 nvmet_feat_data_len(struct nvmet_req *req, u32 cdw10)
		{
		switch (cdw10 & 0xff) {
		case NVME_FEAT_HOST_ID:
		return sizeof(req->sq->ctrl->hostid);
		default:
		return 0;
		}
		}

		u64 nvmet_get_log_page_offset(struct nvme_command *cmd)
		{
		return le64_to_cpu(cmd->get_log_page.lpo);
		@@ -778,7 +788,7 @@ static void nvmet_execute_get_features(struct nvmet_req *req)
		u32 cdw10 = le32_to_cpu(req->cmd->common.cdw10);
		u16 status = 0;

		if (!nvmet_check_data_len(req, 0))
		if (!nvmet_check_data_len(req, nvmet_feat_data_len(req, cdw10)))
		return;

		switch (cdw10 & 0xff) {

+4 −4

Original line number	Diff line number	Diff line
		@@ -3031,7 +3031,7 @@ static void end_bio_bh_io_sync(struct bio *bio)
		* errors, this only handles the "we need to be able to
		* do IO at the final sector" case.
		*/
		void guard_bio_eod(int op, struct bio *bio)
		void guard_bio_eod(struct bio *bio)
		{
		sector_t maxsector;
		struct hd_struct *part;
		@@ -3095,15 +3095,15 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
		bio->bi_end_io = end_bio_bh_io_sync;
		bio->bi_private = bh;

		/* Take care of bh's that straddle the end of the device */
		guard_bio_eod(op, bio);

		if (buffer_meta(bh))
		op_flags \|= REQ_META;
		if (buffer_prio(bh))
		op_flags \|= REQ_PRIO;
		bio_set_op_attrs(bio, op, op_flags);

		/* Take care of bh's that straddle the end of the device */
		guard_bio_eod(bio);

		if (wbc) {
		wbc_init_bio(wbc, bio);
		wbc_account_cgroup_owner(wbc, bh->b_page, bh->b_size);

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ static inline int __sync_blockdev(struct block_device *bdev, int wait)
		/*
		* buffer.c
		*/
		extern void guard_bio_eod(int rw, struct bio *bio);
		extern void guard_bio_eod(struct bio *bio);
		extern int __block_write_begin_int(struct page *page, loff_t pos, unsigned len,
		get_block_t get_block, struct iomap iomap);