Skip to contentSkip to conversation

blktrace fix for 2.6.31

GIT PULL Jens Axboe 1 participant 1 message Aug 12, 2009

Subsystems (2)
lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Just a single patch there, fixing a critical issue with blktrace. Please pull.

git://git.kernel.dk/linux-2.6-block.git for-linus

Alan D. Brunelle (1):
Remove double removal of blktrace directory

 kernel/trace/blktrace.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
kernel/trace/blktrace.c +1 -11
index 1090b0a..7a34cb5 100644
@@ -267,8 +267,8 @@ static void blk_trace_free(struct blk_trace *bt)
 {
 	debugfs_remove(bt->msg_file);
 	debugfs_remove(bt->dropped_file);
-	debugfs_remove(bt->dir);
 	relay_close(bt->rchan);
+	debugfs_remove(bt->dir);
 	free_percpu(bt->sequence);
 	free_percpu(bt->msg_data);
 	kfree(bt);
@@ -378,18 +378,8 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
 
 static int blk_remove_buf_file_callback(struct dentry *dentry)
 {
-	struct dentry *parent = dentry->d_parent;
 	debugfs_remove(dentry);
 
-	/*
-	* this will fail for all but the last file, but that is ok. what we
-	* care about is the top level buts->name directory going away, when
-	* the last trace file is gone. Then we don't have to rmdir() that
-	* manually on trace stop, so it nicely solves the issue with
-	* force killing of running traces.
-	*/
-
-	debugfs_remove(parent);
 	return 0;
 }
 
Signature · 1 line
Jens Axboe