|
 |
7bdf8f |
commit 12add44564f195878c3e346e4bbae845dec67db3
|
|
|
7bdf8f |
Author: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
|
7bdf8f |
Date: Fri Mar 4 16:30:22 2016 -0500
|
|
|
7bdf8f |
|
|
|
7bdf8f |
Grow: Grow_continue_command() remove dead code
|
|
|
7bdf8f |
|
|
|
7bdf8f |
All cases where fd2 is used are completed with a close(fd2), so there
|
|
|
7bdf8f |
is no need to set fd2 = -1 or check for it before exiting.
|
|
|
7bdf8f |
|
|
|
7bdf8f |
Reviewed-by: NeilBrown <neilb@suse.com>
|
|
|
7bdf8f |
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
|
7bdf8f |
|
|
|
7bdf8f |
diff --git a/Grow.c b/Grow.c
|
|
|
7bdf8f |
index c4f417e..c4af5c0 100755
|
|
|
7bdf8f |
--- a/Grow.c
|
|
|
7bdf8f |
+++ b/Grow.c
|
|
|
7bdf8f |
@@ -4752,7 +4752,7 @@ int Grow_continue_command(char *devname, int fd,
|
|
|
7bdf8f |
struct mdinfo *cc = NULL;
|
|
|
7bdf8f |
struct mdstat_ent *mdstat = NULL;
|
|
|
7bdf8f |
int cfd = -1;
|
|
|
7bdf8f |
- int fd2 = -1;
|
|
|
7bdf8f |
+ int fd2;
|
|
|
7bdf8f |
|
|
|
7bdf8f |
dprintf("Grow continue from command line called for %s\n",
|
|
|
7bdf8f |
devname);
|
|
|
7bdf8f |
@@ -4796,8 +4796,6 @@ int Grow_continue_command(char *devname, int fd,
|
|
|
7bdf8f |
continue;
|
|
|
7bdf8f |
err = st->ss->load_super(st, fd2, NULL);
|
|
|
7bdf8f |
close(fd2);
|
|
|
7bdf8f |
- /* invalidate fd2 to avoid possible double close() */
|
|
|
7bdf8f |
- fd2 = -1;
|
|
|
7bdf8f |
if (err)
|
|
|
7bdf8f |
continue;
|
|
|
7bdf8f |
break;
|
|
|
7bdf8f |
@@ -4894,7 +4892,6 @@ int Grow_continue_command(char *devname, int fd,
|
|
|
7bdf8f |
sysfs_init(content, fd2, mdstat->devnm);
|
|
|
7bdf8f |
|
|
|
7bdf8f |
close(fd2);
|
|
|
7bdf8f |
- fd2 = -1;
|
|
|
7bdf8f |
|
|
|
7bdf8f |
/* start mdmon in case it is not running
|
|
|
7bdf8f |
*/
|
|
|
7bdf8f |
@@ -4924,8 +4921,6 @@ int Grow_continue_command(char *devname, int fd,
|
|
|
7bdf8f |
ret_val = Grow_continue(fd, st, content, backup_file, 1, 0);
|
|
|
7bdf8f |
|
|
|
7bdf8f |
Grow_continue_command_exit:
|
|
|
7bdf8f |
- if (fd2 > -1)
|
|
|
7bdf8f |
- close(fd2);
|
|
|
7bdf8f |
if (cfd > -1)
|
|
|
7bdf8f |
close(cfd);
|
|
|
7bdf8f |
st->ss->free_super(st);
|