diff options
| author | Thomas Backlund <tmb@mageia.org> | 2011-12-06 18:51:00 +0000 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2011-12-06 18:51:00 +0000 |
| commit | 2c5aaa70c87d5d03632e17e970fcde6f5801f450 (patch) | |
| tree | 478a9b36f08262e75f75f77ec1fe9d6d06f1a5b1 /mdk-stage1/nfsmount.c | |
| parent | d4ce253d84286819b9f87922d608085ca5c94dc5 (diff) | |
| download | drakx-backup-do-not-use-2c5aaa70c87d5d03632e17e970fcde6f5801f450.tar drakx-backup-do-not-use-2c5aaa70c87d5d03632e17e970fcde6f5801f450.tar.gz drakx-backup-do-not-use-2c5aaa70c87d5d03632e17e970fcde6f5801f450.tar.bz2 drakx-backup-do-not-use-2c5aaa70c87d5d03632e17e970fcde6f5801f450.tar.xz drakx-backup-do-not-use-2c5aaa70c87d5d03632e17e970fcde6f5801f450.zip | |
1.52:
- fix build with gcc-4.6.2
* fixes for -Werror=unused-but-set-variable
* minor whitespace cleanups
Diffstat (limited to 'mdk-stage1/nfsmount.c')
| -rw-r--r-- | mdk-stage1/nfsmount.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mdk-stage1/nfsmount.c b/mdk-stage1/nfsmount.c index 85ffb25c1..02d7ddba8 100644 --- a/mdk-stage1/nfsmount.c +++ b/mdk-stage1/nfsmount.c @@ -284,7 +284,6 @@ int nfsmount_prepare(const char *spec, char **mount_opts) enum clnt_stat clnt_stat; static struct nfs_mount_data data; int nfs_mount_version; - int val; struct sockaddr_in server_addr; struct sockaddr_in mount_server_addr; struct pmap *pm_mnt; @@ -297,12 +296,11 @@ int nfsmount_prepare(const char *spec, char **mount_opts) char *s; int port, mountport, proto, soft, intr; int posix, nocto, noac, broken_suid, nolock; - int retry, tcp; + int tcp; int mountprog, mountvers, nfsprog, nfsvers; int retval; time_t t; time_t prevt; - time_t timeout; nfs_mount_version = find_kernel_nfs_mount_version(); @@ -361,7 +359,6 @@ int nfsmount_prepare(const char *spec, char **mount_opts) nolock = 1; broken_suid = 0; noac = 0; - retry = 10000; /* 10000 minutes ~ 1 week */ tcp = 0; mountprog = MOUNTPROG; @@ -469,10 +466,8 @@ retry_mount: retry_timeout.tv_usec = 0; total_timeout.tv_sec = 20; total_timeout.tv_usec = 0; - timeout = time(NULL) + 60 * retry; prevt = 0; t = 30; - val = 1; /* be careful not to use too many CPU cycles */ @@ -677,7 +672,7 @@ retry_mount: if (fsock != -1) close(fsock); return retval; -} +} /* * We need to translate between nfs status return values and |