Message ID | 20190604142744.15330-1-colin.king@canonical.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [next] blktrace: remove redundant assignment to ret | expand |
On 6/4/19 8:27 AM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Variable ret is being assigned a value that is never read, hence > the assignment is redundant and can be removed. This doesn't look correct to me, here's the full code: ret = -ENOENT; dir = debugfs_lookup(buts->name, blk_debugfs_root); if (!dir) bt->dir = dir = debugfs_create_dir(buts->name, blk_debugfs_root); if (!dir) goto err; [...] err: [...] return ret; The main issue here, to me, looks like we're not dealing with ERR_PTR returns from debugfs_create_dir(), just checking for NULL.
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 2d6e93ab0478..ae7c63d6782c 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -507,8 +507,6 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, if (!bt->msg_data) goto err; - ret = -ENOENT; - dir = debugfs_lookup(buts->name, blk_debugfs_root); if (!dir) bt->dir = dir = debugfs_create_dir(buts->name, blk_debugfs_root);