3 files changed, 8 insertions, 25 deletions

diff --git a/block/blktrace.c b/block/blktrace.c
index d00ac3993c18..498a0a54a6aa 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -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
-                blk_remove_root();
+        else {
+                /* Delete root only if we created it */
+                if (created)
+                        blk_remove_root();
+        }
 
 err:
         mutex_unlock(&blk_tree_mutex);
diff --git a/block/genhd.c b/block/genhd.c
index e609996f2e76..f2ac914160d1 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -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;
                         }
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 3b927be03850..8b919940b2ab 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -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,
 };