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

Commit 9c8ff4f4 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:
  scatterlist: add more safeguards
  Revert "ll_rw_blk: temporarily enable max_segments tweaking"
  mmc: Add missing sg_init_table() call
  block: Fix memory leak in alloc_disk_node()
  alpha: fix sg_page breakage
  blktrace: Make sure BLKTRACETEARDOWN does the full cleanup.
parents 86e67a07 645a8d94

arch/alpha/kernel/pci-noop.c

+8 −6
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/dma-mapping.h>

#include <linux/scatterlist.h>



#include "proto.h"
@@ -172,18 +173,19 @@ dma_alloc_coherent(struct device *dev, size_t size, 
EXPORT_SYMBOL(dma_alloc_coherent);



int

dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,

dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents,

	   enum dma_data_direction direction)

{

	int i;

	struct scatterlist *sg;



	for (i = 0; i < nents; i++ ) {

	for_each_sg(sgl, sg, nents, i) {

		void *va;



		BUG_ON(!sg[i].page);

		va = page_address(sg[i].page) + sg[i].offset;

		sg_dma_address(sg + i) = (dma_addr_t)virt_to_bus(va);

		sg_dma_len(sg + i) = sg[i].length;

		BUG_ON(!sg_page(sg));

		va = sg_virt(sg);

		sg_dma_address(sg) = (dma_addr_t)virt_to_bus(va);

		sg_dma_len(sg) = sg->length;

	}



	return nents;

block/blktrace.c

+7 −2
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static void blk_remove_tree(struct dentry *dir) 
static struct dentry *blk_create_tree(const char *blk_name)

{

	struct dentry *dir = NULL;

	int created = 0;



	mutex_lock(&blk_tree_mutex);
@@ -209,13 +210,17 @@ static struct dentry *blk_create_tree(const char *blk_name) 
		blk_tree_root = debugfs_create_dir("block", NULL);

		if (!blk_tree_root)

			goto err;

		created = 1;

	}



	dir = debugfs_create_dir(blk_name, blk_tree_root);

	if (dir)

		root_users++;

	else

	else {

		/* Delete root only if we created it */

		if (created)

			blk_remove_root();

	}



err:

	mutex_unlock(&blk_tree_mutex);

block/genhd.c

+1 −0
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ struct gendisk *alloc_disk_node(int minors, int node_id) 
			disk->part = kmalloc_node(size,

				GFP_KERNEL | __GFP_ZERO, node_id);

			if (!disk->part) {

				free_disk_stats(disk);

				kfree(disk);

				return NULL;

			}

block/ll_rw_blk.c

+0 −23
Original line number Diff line number Diff line
@@ -4080,23 +4080,7 @@ static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page) 
	return queue_var_show(max_hw_sectors_kb, (page));

}



static ssize_t queue_max_segments_show(struct request_queue *q, char *page)

{

	return queue_var_show(q->max_phys_segments, page);

}



static ssize_t queue_max_segments_store(struct request_queue *q,

					const char *page, size_t count)

{

	unsigned long segments;

	ssize_t ret = queue_var_store(&segments, page, count);



	spin_lock_irq(q->queue_lock);

	q->max_phys_segments = segments;

	spin_unlock_irq(q->queue_lock);



	return ret;

}

static struct queue_sysfs_entry queue_requests_entry = {

	.attr = {.name = "nr_requests", .mode = S_IRUGO | S_IWUSR },

	.show = queue_requests_show,
@@ -4120,12 +4104,6 @@ static struct queue_sysfs_entry queue_max_hw_sectors_entry = { 
	.show = queue_max_hw_sectors_show,

};



static struct queue_sysfs_entry queue_max_segments_entry = {

	.attr = {.name = "max_segments", .mode = S_IRUGO | S_IWUSR },

	.show = queue_max_segments_show,

	.store = queue_max_segments_store,

};



static struct queue_sysfs_entry queue_iosched_entry = {

	.attr = {.name = "scheduler", .mode = S_IRUGO | S_IWUSR },

	.show = elv_iosched_show,
@@ -4137,7 +4115,6 @@ static struct attribute *default_attrs[] = { 
	&queue_ra_entry.attr,

	&queue_max_hw_sectors_entry.attr,

	&queue_max_sectors_entry.attr,

	&queue_max_segments_entry.attr,

	&queue_iosched_entry.attr,

	NULL,

};

drivers/mmc/card/queue.c

+2 −1
Original line number Diff line number Diff line
@@ -180,12 +180,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock 
		blk_queue_max_hw_segments(mq->queue, host->max_hw_segs);

		blk_queue_max_segment_size(mq->queue, host->max_seg_size);



		mq->sg = kzalloc(sizeof(struct scatterlist) *

		mq->sg = kmalloc(sizeof(struct scatterlist) *

			host->max_phys_segs, GFP_KERNEL);

		if (!mq->sg) {

			ret = -ENOMEM;

			goto cleanup_queue;

		}

		sg_init_table(mq->sg, host->max_phys_segs);

	}



	init_MUTEX(&mq->thread_sem);