diff options
| author | Jeff Layton <jlaton@redhat.com> | 2008-05-07 10:37:40 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2008-05-07 10:37:40 -0400 |
| commit | 5fb4042ce4eb4fd5e50e3fb0f78bbd20b4d46e78 (patch) | |
| tree | 01627ec684bce5d8310d4ce75ed6e1a7e065fed8 /utils/mount/nfsmount.c | |
| parent | 281ca299724f24e7b19c1eca04bba03410e2a306 (diff) | |
| download | nfs-utils-5fb4042ce4eb4fd5e50e3fb0f78bbd20b4d46e78.tar.gz nfs-utils-5fb4042ce4eb4fd5e50e3fb0f78bbd20b4d46e78.tar.xz nfs-utils-5fb4042ce4eb4fd5e50e3fb0f78bbd20b4d46e78.zip | |
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>
Diffstat (limited to 'utils/mount/nfsmount.c')
| -rw-r--r-- | utils/mount/nfsmount.c | 14 |
1 files changed, 0 insertions, 14 deletions
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; |