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

Commit 77d0b194 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-4.21/block-20190102' of git://git.kernel.dk/linux-block 

Pull more block updates from Jens Axboe:

 - Dead code removal for loop/sunvdc (Chengguang)

 - Mark BIDI support for bsg as deprecated, logging a single dmesg
   warning if anyone is actually using it (Christoph)

 - blkcg cleanup, killing a dead function and making the tryget_closest
   variant easier to read (Dennis)

 - Floppy fixes, one fixing a regression in swim3 (Finn)

 - lightnvm use-after-free fix (Gustavo)

 - gdrom leak fix (Wenwen)

 - a set of drbd updates (Lars, Luc, Nathan, Roland)

* tag 'for-4.21/block-20190102' of git://git.kernel.dk/linux-block: (28 commits)
  block/swim3: Fix regression on PowerBook G3
  block/swim3: Fix -EBUSY error when re-opening device after unmount
  block/swim3: Remove dead return statement
  block/amiflop: Don't log error message on invalid ioctl
  gdrom: fix a memory leak bug
  lightnvm: pblk: fix use-after-free bug
  block: sunvdc: remove redundant code
  block: loop: remove redundant code
  bsg: deprecate BIDI support in bsg
  blkcg: remove unused __blkg_release_rcu()
  blkcg: clean up blkg_tryget_closest()
  drbd: Change drbd_request_detach_interruptible's return type to int
  drbd: Avoid Clang warning about pointless switch statment
  drbd: introduce P_ZEROES (REQ_OP_WRITE_ZEROES on the "wire")
  drbd: skip spurious timeout (ping-timeo) when failing promote
  drbd: don't retry connection if peers do not agree on "authentication" settings
  drbd: fix print_st_err()'s prototype to match the definition
  drbd: avoid spurious self-outdating with concurrent disconnect / down
  drbd: do not block when adjusting "disk-options" while IO is frozen
  drbd: fix comment typos
  ...
parents b79f9f93 427c5ce4

block/bio.c

+4 −0
Original line number Diff line number Diff line
@@ -2097,8 +2097,12 @@ EXPORT_SYMBOL_GPL(bio_associate_blkg); 
 */

void bio_clone_blkg_association(struct bio *dst, struct bio *src)

{

	rcu_read_lock();



	if (src->bi_blkg)

		__bio_associate_blkg(dst, src->bi_blkg);



	rcu_read_unlock();

}

EXPORT_SYMBOL_GPL(bio_clone_blkg_association);

#endif /* CONFIG_BLK_CGROUP */

block/blk-cgroup.c

+0 −23
Original line number Diff line number Diff line
@@ -438,29 +438,6 @@ static void blkg_destroy_all(struct request_queue *q) 
	spin_unlock_irq(&q->queue_lock);

}



/*

 * A group is RCU protected, but having an rcu lock does not mean that one

 * can access all the fields of blkg and assume these are valid.  For

 * example, don't try to follow throtl_data and request queue links.

 *

 * Having a reference to blkg under an rcu allows accesses to only values

 * local to groups like group stats and group rate limits.

 */

void __blkg_release_rcu(struct rcu_head *rcu_head)

{

	struct blkcg_gq *blkg = container_of(rcu_head, struct blkcg_gq, rcu_head);



	/* release the blkcg and parent blkg refs this blkg has been holding */

	css_put(&blkg->blkcg->css);

	if (blkg->parent)

		blkg_put(blkg->parent);



	wb_congested_put(blkg->wb_congested);



	blkg_free(blkg);

}

EXPORT_SYMBOL_GPL(__blkg_release_rcu);



static int blkcg_reset_stats(struct cgroup_subsys_state *css,

			     struct cftype *cftype, u64 val)

{

block/bsg.c

+4 −0
Original line number Diff line number Diff line
@@ -177,6 +177,10 @@ bsg_map_hdr(struct request_queue *q, struct sg_io_v4 *hdr, fmode_t mode) 
			goto out;

		}



		pr_warn_once(

			"BIDI support in bsg has been deprecated and might be removed. "

			"Please report your use case to linux-scsi@vger.kernel.org\n");



		next_rq = blk_get_request(q, REQ_OP_SCSI_IN, 0);

		if (IS_ERR(next_rq)) {

			ret = PTR_ERR(next_rq);

drivers/block/amiflop.c

+0 −2
Original line number Diff line number Diff line
@@ -1601,8 +1601,6 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, 
			return p->type->read_size;

#endif

	default:

		printk(KERN_DEBUG "fd_ioctl: unknown cmd %d for drive %d.",

		       cmd, drive);

		return -ENOSYS;

	}

	return 0;

drivers/block/drbd/drbd_debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ static void seq_print_peer_request_flags(struct seq_file *m, struct drbd_peer_re 
	seq_print_rq_state_bit(m, f & EE_CALL_AL_COMPLETE_IO, &sep, "in-AL");

	seq_print_rq_state_bit(m, f & EE_SEND_WRITE_ACK, &sep, "C");

	seq_print_rq_state_bit(m, f & EE_MAY_SET_IN_SYNC, &sep, "set-in-sync");

	seq_print_rq_state_bit(m, f & EE_TRIM, &sep, "trim");

	seq_print_rq_state_bit(m, f & EE_ZEROOUT, &sep, "zero-out");

	seq_print_rq_state_bit(m, f & EE_WRITE_SAME, &sep, "write-same");

	seq_putc(m, '\n');

}