Commit b68e9d45 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -307,7 +307,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, ...@@ -307,7 +307,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
return PTR_ERR(bio); return PTR_ERR(bio);
if (rq_data_dir(rq) == WRITE) if (rq_data_dir(rq) == WRITE)
bio->bi_rw |= (1 << REQ_WRITE); bio->bi_rw |= REQ_WRITE;
if (do_copy) if (do_copy)
rq->cmd_flags |= REQ_COPY_USER; rq->cmd_flags |= REQ_COPY_USER;
......
...@@ -1019,10 +1019,20 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create) ...@@ -1019,10 +1019,20 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create)
*/ */
atomic_set(&cfqg->ref, 1); atomic_set(&cfqg->ref, 1);
/* Add group onto cgroup list */ /*
sscanf(dev_name(bdi->dev), "%u:%u", &major, &minor); * Add group onto cgroup list. It might happen that bdi->dev is
cfq_blkiocg_add_blkio_group(blkcg, &cfqg->blkg, (void *)cfqd, * 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)); MKDEV(major, minor));
} else
cfq_blkiocg_add_blkio_group(blkcg, &cfqg->blkg, (void *)cfqd,
0);
cfqg->weight = blkcg_get_weight(blkcg, cfqg->blkg.dev); cfqg->weight = blkcg_get_weight(blkcg, cfqg->blkg.dev);
/* Add group on cfqd list */ /* Add group on cfqd list */
......
...@@ -4792,7 +4792,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, ...@@ -4792,7 +4792,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
clean4: clean4:
kfree(h->cmd_pool_bits); kfree(h->cmd_pool_bits);
/* Free up sg elements */ /* 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[k]);
kfree(h->scatter_list); kfree(h->scatter_list);
cciss_free_sg_chain_blocks(h->cmd_sg_list, h->nr_cmds); cciss_free_sg_chain_blocks(h->cmd_sg_list, h->nr_cmds);
......
...@@ -788,10 +788,11 @@ static const struct file_operations zero_fops = { ...@@ -788,10 +788,11 @@ static const struct file_operations zero_fops = {
/* /*
* capabilities for /dev/zero * capabilities for /dev/zero
* - permits private mappings, "copies" are taken of the source of zeros * - permits private mappings, "copies" are taken of the source of zeros
* - no writeback happens
*/ */
static struct backing_dev_info zero_bdi = { static struct backing_dev_info zero_bdi = {
.name = "char/mem", .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 = { static const struct file_operations full_fops = {
......
...@@ -40,7 +40,9 @@ struct backing_dev_info directly_mappable_cdev_bdi = { ...@@ -40,7 +40,9 @@ struct backing_dev_info directly_mappable_cdev_bdi = {
#endif #endif
/* permit direct mmap, for read, write or exec */ /* permit direct mmap, for read, write or exec */
BDI_CAP_MAP_DIRECT | 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; static struct kobj_map *cdev_map;
......
...@@ -52,8 +52,6 @@ struct wb_writeback_work { ...@@ -52,8 +52,6 @@ struct wb_writeback_work {
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include <trace/events/writeback.h> #include <trace/events/writeback.h>
#define inode_to_bdi(inode) ((inode)->i_mapping->backing_dev_info)
/* /*
* We don't actually have pdflush, but this one is exported though /proc... * We don't actually have pdflush, but this one is exported though /proc...
*/ */
...@@ -71,6 +69,27 @@ int writeback_in_progress(struct backing_dev_info *bdi) ...@@ -71,6 +69,27 @@ int writeback_in_progress(struct backing_dev_info *bdi)
return test_bit(BDI_writeback_running, &bdi->state); return test_bit(BDI_writeback_running, &bdi->state);
} }
static inline struct backing_dev_info *inode_to_bdi(struct inode *inode)
{
struct super_block *sb = inode->i_sb;
struct backing_dev_info *bdi = inode->i_mapping->backing_dev_info;
/*
* For inodes on standard filesystems, we use superblock's bdi. For
* inodes on virtual filesystems, we want to use inode mapping's bdi
* because they can possibly point to something useful (think about
* block_dev filesystem).
*/
if (sb->s_bdi && sb->s_bdi != &noop_backing_dev_info) {
/* Some device inodes could play dirty tricks. Catch them... */
WARN(bdi != sb->s_bdi && bdi_cap_writeback_dirty(bdi),
"Dirtiable inode bdi %s != sb bdi %s\n",
bdi->name, sb->s_bdi->name);
return sb->s_bdi;
}
return bdi;
}
static void bdi_queue_work(struct backing_dev_info *bdi, static void bdi_queue_work(struct backing_dev_info *bdi,
struct wb_writeback_work *work) struct wb_writeback_work *work)
{ {
......
...@@ -30,6 +30,7 @@ EXPORT_SYMBOL_GPL(default_backing_dev_info); ...@@ -30,6 +30,7 @@ EXPORT_SYMBOL_GPL(default_backing_dev_info);
struct backing_dev_info noop_backing_dev_info = { struct backing_dev_info noop_backing_dev_info = {
.name = "noop", .name = "noop",
.capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK,
}; };
EXPORT_SYMBOL_GPL(noop_backing_dev_info); EXPORT_SYMBOL_GPL(noop_backing_dev_info);
...@@ -243,6 +244,7 @@ static int __init default_bdi_init(void) ...@@ -243,6 +244,7 @@ static int __init default_bdi_init(void)
err = bdi_init(&default_backing_dev_info); err = bdi_init(&default_backing_dev_info);
if (!err) if (!err)
bdi_register(&default_backing_dev_info, NULL, "default"); bdi_register(&default_backing_dev_info, NULL, "default");
err = bdi_init(&noop_backing_dev_info);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment