52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
|
commit 5fb4042ce4eb4fd5e50e3fb0f78bbd20b4d46e78
|
||
|
|
Author: Jeff Layton <jlaton@redhat.com>
|
||
|
|
Date: Wed May 7 10:37:40 2008 -0400
|
||
|
|
|
||
|
|
The prev_bg_host stuff made sense when NFS didn't have its own mount
|
||
|
|
handler. Now though, each mount.nfs invocation is really a one-shot
|
||
|
|
affair, and this check no longer works. It also leaked memory. Remove
|
||
|
|
it.
|
||
|
|
|
||
|
|
Signed-off-by: Jeff Layton <jlayton@redhat.com>
|
||
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||
|
|
|
||
|
|
diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
|
||
|
|
index a9dd917..6a04518 100644
|
||
|
|
--- a/utils/mount/nfsmount.c
|
||
|
|
+++ b/utils/mount/nfsmount.c
|
||
|
|
@@ -494,7 +494,6 @@ int
|
||
|
|
nfsmount(const char *spec, const char *node, int flags,
|
||
|
|
char **extra_opts, int fake, int running_bg)
|
||
|
|
{
|
||
|
|
- static char *prev_bg_host;
|
||
|
|
char hostdir[1024];
|
||
|
|
char *hostname, *dirname, *old_opts, *mounthost = NULL;
|
||
|
|
char new_opts[1024], cbuf[1024];
|
||
|
|
@@ -628,18 +627,6 @@ nfsmount(const char *spec, const char *node, int flags,
|
||
|
|
if (flags & MS_REMOUNT)
|
||
|
|
goto out_ok;
|
||
|
|
|
||
|
|
- /*
|
||
|
|
- * If the previous mount operation on the same host was
|
||
|
|
- * backgrounded, and the "bg" for this mount is also set,
|
||
|
|
- * give up immediately, to avoid the initial timeout.
|
||
|
|
- */
|
||
|
|
- if (bg && !running_bg &&
|
||
|
|
- prev_bg_host && strcmp(hostname, prev_bg_host) == 0) {
|
||
|
|
- if (retry > 0)
|
||
|
|
- retval = EX_BG;
|
||
|
|
- return retval;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
/* create mount deamon client */
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -708,7 +695,6 @@ nfsmount(const char *spec, const char *node, int flags,
|
||
|
|
continue;
|
||
|
|
}
|
||
|
|
if (!running_bg) {
|
||
|
|
- prev_bg_host = xstrdup(hostname);
|
||
|
|
if (retry > 0)
|
||
|
|
retval = EX_BG;
|
||
|
|
goto fail;
|