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

Commit b68e9d45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  bdi: Fix warnings in __mark_inode_dirty for /dev/zero and friends
  char: Mark /dev/zero and /dev/kmem as not capable of writeback
  bdi: Initialize noop_backing_dev_info properly
  cfq-iosched: fix a kernel OOPs when usb key is inserted
  block: fix blk_rq_map_kern bio direction flag
  cciss: freeing uninitialized data on error path
parents 62f1b494 692ebd17

block/blk-map.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, 
		return PTR_ERR(bio);



	if (rq_data_dir(rq) == WRITE)

		bio->bi_rw |= (1 << REQ_WRITE);

		bio->bi_rw |= REQ_WRITE;



	if (do_copy)

		rq->cmd_flags |= REQ_COPY_USER;

block/cfq-iosched.c

+13 −3
Original line number Diff line number Diff line
@@ -1019,10 +1019,20 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create) 
	 */

	atomic_set(&cfqg->ref, 1);



	/* Add group onto cgroup list */

	/*

	 * Add group onto cgroup list. It might happen that bdi->dev is

	 * not initiliazed yet. Initialize this new group without major

	 * and minor info and this info will be filled in once a new thread

	 * comes for IO. See code above.

	 */

	if (bdi->dev) {

		sscanf(dev_name(bdi->dev), "%u:%u", &major, &minor);

		cfq_blkiocg_add_blkio_group(blkcg, &cfqg->blkg, (void *)cfqd,

					MKDEV(major, minor));

	} else

		cfq_blkiocg_add_blkio_group(blkcg, &cfqg->blkg, (void *)cfqd,

					0);



	cfqg->weight = blkcg_get_weight(blkcg, cfqg->blkg.dev);



	/* Add group on cfqd list */

drivers/block/cciss.c

+1 −1
Original line number Diff line number Diff line
@@ -4792,7 +4792,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, 
clean4:

	kfree(h->cmd_pool_bits);

	/* Free up sg elements */

	for (k = 0; k < h->nr_cmds; k++)

	for (k-- ; k >= 0; k--)

		kfree(h->scatter_list[k]);

	kfree(h->scatter_list);

	cciss_free_sg_chain_blocks(h->cmd_sg_list, h->nr_cmds);

drivers/char/mem.c

+2 −1
Original line number Diff line number Diff line
@@ -788,10 +788,11 @@ static const struct file_operations zero_fops = { 
/*

 * capabilities for /dev/zero

 * - permits private mappings, "copies" are taken of the source of zeros

 * - no writeback happens

 */

static struct backing_dev_info zero_bdi = {

	.name		= "char/mem",

	.capabilities	= BDI_CAP_MAP_COPY,

	.capabilities	= BDI_CAP_MAP_COPY | BDI_CAP_NO_ACCT_AND_WRITEBACK,

};



static const struct file_operations full_fops = {

fs/char_dev.c

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ struct backing_dev_info directly_mappable_cdev_bdi = { 
#endif

		/* permit direct mmap, for read, write or exec */

		BDI_CAP_MAP_DIRECT |

		BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP),

		BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP |

		/* no writeback happens */

		BDI_CAP_NO_ACCT_AND_WRITEBACK),

};



static struct kobj_map *cdev_map;