diff options
| author | David S. Miller | 2011-08-08 08:20:26 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-08-08 08:20:26 +0200 |
| commit | 19fd61785a580c60cba900c5171bfadb57dd5056 (patch) | |
| tree | 1e491fb014be0dc03f4b6755bb94e73afd38c455 /block/blk-timeout.c | |
| parent | netxen: add vlan LRO support (diff) | |
| parent | dp83640: increase receive time stamp buffer size (diff) | |
| download | kernel-qcow2-linux-19fd61785a580c60cba900c5171bfadb57dd5056.tar.gz kernel-qcow2-linux-19fd61785a580c60cba900c5171bfadb57dd5056.tar.xz kernel-qcow2-linux-19fd61785a580c60cba900c5171bfadb57dd5056.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'block/blk-timeout.c')
| -rw-r--r-- | block/blk-timeout.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 4f0c06c7a338..780354888958 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -28,7 +28,10 @@ int blk_should_fake_timeout(struct request_queue *q) static int __init fail_io_timeout_debugfs(void) { - return init_fault_attr_dentries(&fail_io_timeout, "fail_io_timeout"); + struct dentry *dir = fault_create_debugfs_attr("fail_io_timeout", + NULL, &fail_io_timeout); + + return IS_ERR(dir) ? PTR_ERR(dir) : 0; } late_initcall(fail_io_timeout_debugfs); |