diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-10-15 16:37:10 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-10-15 16:37:10 -0400 |
| commit | 21f685b6c1914bef2cf1e54ec5f73c7dce10a9f1 (patch) | |
| tree | 6b2cfea84a62ec018e58d7c2e8afc5e8f1f40ae1 /debugfs | |
| parent | 7595699d09d32863b40deac1190e5c2b091efb36 (diff) | |
| parent | a0e173cd0ed483d03eb54db946e403d129652e31 (diff) | |
Merge branch 'maint' into next
Diffstat (limited to 'debugfs')
| -rw-r--r-- | debugfs/journal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debugfs/journal.c b/debugfs/journal.c index 9997c7c7..56a68be5 100644 --- a/debugfs/journal.c +++ b/debugfs/journal.c @@ -793,14 +793,14 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) kbytes_written = stats->bytes_written >> 10; ext2fs_mmp_stop(fs); - fsname = strdup(fs->device_name); + fsname = fs->device_name; + fs->device_name = NULL; fsflags = fs->flags; fsblocksize = fs->blocksize; ext2fs_free(fs); - retval = ext2fs_open(fsname, fsflags, - 0, fsblocksize, io_ptr, - fsp); - free(fsname); + *fsp = NULL; + retval = ext2fs_open(fsname, fsflags, 0, fsblocksize, io_ptr, fsp); + ext2fs_free_mem(&fsname); if (retval) return retval; |