From d61b70624cc66fdfe3f5ac3e9ceeae57155a8774 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 11 Jan 2008 13:37:01 +0100 Subject: [PATCH] --- yaml --- r: 75374 b: refs/heads/master c: 11a57153e3377ffdf8cfca2eda9a99063f66b957 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blktrace.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 772f0bcbca41..254a60ba1e12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2997c8c4a0b179e8b834a7f30ba4323f2c60ccf4 +refs/heads/master: 11a57153e3377ffdf8cfca2eda9a99063f66b957 diff --git a/trunk/block/blktrace.c b/trunk/block/blktrace.c index 7471621d4ded..9b4da4ae3c7d 100644 --- a/trunk/block/blktrace.c +++ b/trunk/block/blktrace.c @@ -178,7 +178,7 @@ void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes, EXPORT_SYMBOL_GPL(__blk_add_trace); static struct dentry *blk_tree_root; -static struct mutex blk_tree_mutex; +static DEFINE_MUTEX(blk_tree_mutex); static unsigned int root_users; static inline void blk_remove_root(void) @@ -504,13 +504,3 @@ void blk_trace_shutdown(struct request_queue *q) blk_trace_remove(q); } } - -static __init int blk_trace_init(void) -{ - mutex_init(&blk_tree_mutex); - - return 0; -} - -module_init(blk_trace_init); -