projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[linux-drm-fsl-dcu.git]
/
block
/
blktrace.c
diff --git
a/block/blktrace.c
b/block/blktrace.c
index d3679dd1d2201785e91194415d01736a16af54bc..3f0e7c37c059037080cbe44456f176c5a4800319 100644
(file)
--- a/
block/blktrace.c
+++ b/
block/blktrace.c
@@
-264,7
+264,7
@@
static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
}
return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
}
-static struct file_operations blk_dropped_fops = {
+static
const
struct file_operations blk_dropped_fops = {
.owner = THIS_MODULE,
.open = blk_dropped_open,
.read = blk_dropped_read,
.owner = THIS_MODULE,
.open = blk_dropped_open,
.read = blk_dropped_read,
@@
-363,10
+363,9
@@
static int blk_trace_setup(request_queue_t *q, struct block_device *bdev,
if (!bt->dropped_file)
goto err;
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;
if (!bt->rchan)
goto err;
- bt->rchan->private_data = bt;
bt->act_mask = buts.act_mask;
if (!bt->act_mask)
bt->act_mask = buts.act_mask;
if (!bt->act_mask)