The patch titled Subject: kernel/relay.c: move remove_buf_file inside relay_close_buf() has been removed from the -mm tree. Its filename was kernel-relayc-move-remove_buf_file-inside-relay_close_buf.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Dmitry Monakhov <dmonakhov@xxxxxxxxxx> Subject: kernel/relay.c: move remove_buf_file inside relay_close_buf() Currently remove_buf_file callback is called from from kobject release method. This result in follow issue: # blktrace -d /dev/sda1 -d /dev/sda -o test blktrace_setup() dir = create_dir() rchan = relay_open(dir,...) ->create_buf_file_callback buf_file = debugfs_create_file(dir, ) Userspace will open buf_file. Later we make a decision to stop tracing blktrace_down() relay_close(rhcan) /* just decrement kobj reference */ /* since it is not zero then callback not called */ debugfs_remove(dir) /* FAIL due to non empty dir */ Later user space will close the file and file will be deleted, but directory still exist. user_space_close() ->file_release ->release_buf_file_callback ->debugfs_remove(buf_file ## TESTCASE: # blktrace -d /dev/sda1 -d /dev/sda -o test # After that blktrace infrastructure will remain broken in # an unusable state so: blktrace -d /dev/sda1 will not work. In fact this is general issue, blktrace is just one of examples. We can not reliably remove parent dir until all users close the buf_file. Solution: We don't have to wait that long. File should be deleted inside relay_close_buf(). Signed-off-by: Dmitry Monakhov <dmonakhov@xxxxxxxxxx> Acked-by: Jens Axboe <axboe@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: "zhangwei(Jovi)" <jovi.zhangwei@xxxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Eric Dumazet <edumazet@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/relay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN kernel/relay.c~kernel-relayc-move-remove_buf_file-inside-relay_close_buf kernel/relay.c --- a/kernel/relay.c~kernel-relayc-move-remove_buf_file-inside-relay_close_buf +++ a/kernel/relay.c @@ -234,7 +234,6 @@ static void relay_destroy_buf(struct rch static void relay_remove_buf(struct kref *kref) { struct rchan_buf *buf = container_of(kref, struct rchan_buf, kref); - buf->chan->cb->remove_buf_file(buf->dentry); relay_destroy_buf(buf); } @@ -489,6 +488,7 @@ static void relay_close_buf(struct rchan { buf->finalized = 1; del_timer_sync(&buf->timer); + buf->chan->cb->remove_buf_file(buf->dentry); kref_put(&buf->kref, relay_remove_buf); } _ Patches currently in -mm which might be from dmonakhov@xxxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html