2 files changed, 2 insertions, 3 deletions

diff --git a/block/blktrace.c b/block/blktrace.c
index d3679dd1d220..d36b32ed22f4 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -363,10 +363,9 @@ static int blk_trace_setup(request_queue_t *q, struct block_device *bdev,
         if (!bt->dropped_file)
                 goto err;
 
-        bt->rchan = relay_open("trace", dir, buts.buf_size, buts.buf_nr, &blk_relay_callbacks);
+        bt->rchan = relay_open("trace", dir, buts.buf_size, buts.buf_nr, &blk_relay_callbacks, bt);
         if (!bt->rchan)
                 goto err;
-        bt->rchan->private_data = bt;
 
         bt->act_mask = buts.act_mask;
         if (!bt->act_mask)
diff --git a/block/ioctl.c b/block/ioctl.c
index f6962b64660e..e3f5eb9882cf 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -61,7 +61,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
                                 }
                         }
                         /* all seems OK */
-                        add_partition(disk, part, start, length);
+                        add_partition(disk, part, start, length, ADDPART_FLAG_NONE);
                         mutex_unlock(&bdev->bd_mutex);
                         return 0;
                 case BLKPG_DEL_PARTITION: