git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
block
/
blktrace.c
diff --git
a/block/blktrace.c
b/block/blktrace.c
index
b8c0702
..
2b4ef2b
100644
(file)
--- a/
block/blktrace.c
+++ b/
block/blktrace.c
@@
-80,7
+80,7
@@
static u32 bio_act[5] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_AC
#define trace_sync_bit(rw) \
(((rw) & (1 << BIO_RW_SYNC)) >> (BIO_RW_SYNC - 1))
#define trace_ahead_bit(rw) \
#define trace_sync_bit(rw) \
(((rw) & (1 << BIO_RW_SYNC)) >> (BIO_RW_SYNC - 1))
#define trace_ahead_bit(rw) \
- (((rw) & (1 << BIO_RW_AHEAD)) << (
BIO_RW_AHEAD - 0
))
+ (((rw) & (1 << BIO_RW_AHEAD)) << (
2 - BIO_RW_AHEAD
))
/*
* The worker for the various blk_add_trace*() types. Fills out a
/*
* The worker for the various blk_add_trace*() types. Fills out a
@@
-217,7
+217,7
@@
static int blk_trace_remove(request_queue_t *q)
static int blk_dropped_open(struct inode *inode, struct file *filp)
{
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;
}
return 0;
}