Merge branch 'master' into upstream

1 files changed, 1 insertions, 1 deletions

diff --git a/block/blktrace.c b/block/blktrace.c
index 265f7a830619..2b4ef2b89b8d 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -217,7 +217,7 @@ static int blk_trace_remove(request_queue_t *q)
 
 static int blk_dropped_open(struct inode *inode, struct file *filp)
 {
-        filp->private_data = inode->u.generic_ip;
+        filp->private_data = inode->i_private;
 
         return 0;
 }