aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 11:54:02 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 11:54:02 +0000
commite2e56c7c4129de7d20df42e8239fd304c81ef29b (patch)
tree0f9eb8281fac2f87c79a888dac49b27a1965b366 /util-linux
parente3c150bc67cb158ee854ffb498f0066c79cd842c (diff)
downloadbusybox-w32-e2e56c7c4129de7d20df42e8239fd304c81ef29b.tar.gz
busybox-w32-e2e56c7c4129de7d20df42e8239fd304c81ef29b.tar.bz2
busybox-w32-e2e56c7c4129de7d20df42e8239fd304c81ef29b.zip
- single KERNEL_VERSION(a,b,c) macro in platform.h
- rename get_kernel_revision() to get_linux_version_code from Robert P. J. Day
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mkswap.c10
-rw-r--r--util-linux/nfsmount.c13
2 files changed, 11 insertions, 12 deletions
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 44d809a36..0054eca24 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -61,14 +61,14 @@ static int check = 0;
61static int badpages = 0; 61static int badpages = 0;
62#if ENABLE_FEATURE_MKSWAP_V0 62#if ENABLE_FEATURE_MKSWAP_V0
63static int version = -1; 63static int version = -1;
64#define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r))
65#else 64#else
66#define version 1 65#define version 1
67/* and make sure that we optimize away anything which would deal with checking 66/* and make sure that we optimize away anything which would deal with checking
68 * the kernel revision as we have v1 support only anyway. 67 * the kernel revision as we have v1 support only anyway.
69 */ 68 */
70#define MAKE_VERSION(p,q,r) 1 69#undef KERNEL_VERSION
71#define get_kernel_revision() 1 70#define KERNEL_VERSION(p,q,r) 1
71#define get_linux_version_code() 1
72#endif 72#endif
73 73
74/* 74/*
@@ -293,7 +293,7 @@ int mkswap_main(int argc, char **argv)
293 if (sz & 4) { 293 if (sz & 4) {
294 version = bb_xgetlarg(tmp, 10, 0, 1); 294 version = bb_xgetlarg(tmp, 10, 0, 1);
295 } else { 295 } else {
296 if (get_kernel_revision() < MAKE_VERSION(2, 1, 117)) 296 if (get_linux_version_code() < KERNEL_VERSION(2, 1, 117))
297 version = 0; 297 version = 0;
298 else 298 else
299 version = 1; 299 version = 1;
@@ -327,7 +327,7 @@ int mkswap_main(int argc, char **argv)
327#else 327#else
328 if (!version) 328 if (!version)
329 maxpages = V0_MAX_PAGES; 329 maxpages = V0_MAX_PAGES;
330 else if (get_kernel_revision() >= MAKE_VERSION(2, 2, 1)) 330 else if (get_linux_version_code() >= KERNEL_VERSION(2,2,1))
331 maxpages = V1_MAX_PAGES; 331 maxpages = V1_MAX_PAGES;
332 else { 332 else {
333 maxpages = V1_OLD_MAX_PAGES; 333 maxpages = V1_OLD_MAX_PAGES;
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index be0c87f71..7b742cb5f 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -214,7 +214,6 @@ enum {
214 214
215static char *nfs_strerror(int status); 215static char *nfs_strerror(int status);
216 216
217#define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r))
218#define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2) 217#define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2)
219 218
220enum { 219enum {
@@ -249,13 +248,13 @@ find_kernel_nfs_mount_version(void)
249 248
250 nfs_mount_version = NFS_MOUNT_VERSION; /* default */ 249 nfs_mount_version = NFS_MOUNT_VERSION; /* default */
251 250
252 kernel_version = get_kernel_revision(); 251 kernel_version = get_linux_version_code();
253 if (kernel_version) { 252 if (kernel_version) {
254 if (kernel_version < MAKE_VERSION(2,1,32)) 253 if (kernel_version < KERNEL_VERSION(2,1,32))
255 nfs_mount_version = 1; 254 nfs_mount_version = 1;
256 else if (kernel_version < MAKE_VERSION(2,2,18) || 255 else if (kernel_version < KERNEL_VERSION(2,2,18) ||
257 (kernel_version >= MAKE_VERSION(2,3,0) && 256 (kernel_version >= KERNEL_VERSION(2,3,0) &&
258 kernel_version < MAKE_VERSION(2,3,99))) 257 kernel_version < KERNEL_VERSION(2,3,99)))
259 nfs_mount_version = 3; 258 nfs_mount_version = 3;
260 else 259 else
261 nfs_mount_version = 4; /* since 2.3.99pre4 */ 260 nfs_mount_version = 4; /* since 2.3.99pre4 */
@@ -844,7 +843,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
844 * to avoid problems with multihomed hosts. 843 * to avoid problems with multihomed hosts.
845 * --Swen 844 * --Swen
846 */ 845 */
847 if (get_kernel_revision() <= 66314 846 if (get_linux_version_code() <= KERNEL_VERSION(2,3,10)
848 && connect(fsock, (struct sockaddr *) &server_addr, 847 && connect(fsock, (struct sockaddr *) &server_addr,
849 sizeof (server_addr)) < 0) { 848 sizeof (server_addr)) < 0) {
850 perror(_("nfs connect")); 849 perror(_("nfs connect"));