mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
UBIFS: unify error path dbg_debugfs_init_fs
This is just a small clean-up patch which simlifies and unifies the error path in the dbg_debugfs_init_fs(). We have common error path for all failure cases in this function except of the very first case. And this patch makes the first failure case use the same error path as the other cases by using the 'fname' and 'dent' variables. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Acked-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
This commit is contained in:
parent
81354de3d8
commit
cc6a86b950
@ -2806,13 +2806,11 @@ int dbg_debugfs_init_fs(struct ubifs_info *c)
|
||||
struct ubifs_debug_info *d = c->dbg;
|
||||
|
||||
sprintf(d->dfs_dir_name, "ubi%d_%d", c->vi.ubi_num, c->vi.vol_id);
|
||||
d->dfs_dir = debugfs_create_dir(d->dfs_dir_name, dfs_rootdir);
|
||||
if (IS_ERR(d->dfs_dir)) {
|
||||
err = PTR_ERR(d->dfs_dir);
|
||||
ubifs_err("cannot create \"%s\" debugfs directory, error %d\n",
|
||||
d->dfs_dir_name, err);
|
||||
fname = d->dfs_dir_name;
|
||||
dent = debugfs_create_dir(fname, dfs_rootdir);
|
||||
if (IS_ERR(dent))
|
||||
goto out;
|
||||
}
|
||||
d->dfs_dir = dent;
|
||||
|
||||
fname = "dump_lprops";
|
||||
dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops);
|
||||
@ -2835,11 +2833,11 @@ int dbg_debugfs_init_fs(struct ubifs_info *c)
|
||||
return 0;
|
||||
|
||||
out_remove:
|
||||
debugfs_remove_recursive(d->dfs_dir);
|
||||
out:
|
||||
err = PTR_ERR(dent);
|
||||
ubifs_err("cannot create \"%s\" debugfs directory, error %d\n",
|
||||
fname, err);
|
||||
debugfs_remove_recursive(d->dfs_dir);
|
||||
out:
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user