summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorBoaz Harrosh <bharrosh@panasas.com>2011-08-03 20:18:01 -0700
committerBoaz Harrosh <bharrosh@panasas.com>2011-08-04 12:35:23 -0700
commit9ce730475e1b950d78a69c1be3410109c103ac98 (patch)
tree7bc785ad8990932b168a51036e39cadbb03bddfa /fs
parent6d4073e88132259485ef1b2c88daa5e50c95789c (diff)
downloadlinux-3.10-9ce730475e1b950d78a69c1be3410109c103ac98.tar.gz
linux-3.10-9ce730475e1b950d78a69c1be3410109c103ac98.tar.bz2
linux-3.10-9ce730475e1b950d78a69c1be3410109c103ac98.zip
exofs: Small cleanup of exofs_fill_super
Small cleanup that unifies duplicated code used in both the error and success cases Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/exofs/super.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index a747c871d31..65fe5debe11 100644
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -698,6 +698,8 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
odi.osdname_len = strlen(opts->dev_name);
odi.osdname = (u8 *)opts->dev_name;
od = osduld_info_lookup(&odi);
+ kfree(opts->dev_name);
+ opts->dev_name = NULL;
} else {
od = osduld_path_lookup(opts->dev_name);
}
@@ -806,16 +808,12 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
_exofs_print_device("Mounting", opts->dev_name, sbi->layout.s_ods[0],
sbi->layout.s_pid);
- if (opts->is_osdname)
- kfree(opts->dev_name);
return 0;
free_sbi:
EXOFS_ERR("Unable to mount exofs on %s pid=0x%llx err=%d\n",
opts->dev_name, sbi->layout.s_pid, ret);
exofs_free_sbi(sbi);
- if (opts->is_osdname)
- kfree(opts->dev_name);
return ret;
}