wok-current view busybox/stuff/busybox-1.21-nfs-segfault.u @ rev 13947
gpm: update bdeps
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Tue Jan 29 18:27:09 2013 +0100 (2013-01-29) |
| parents | |
| children |
line source
1 --- a/util-linux/mount.c
2 +++ b/util-linux/mount.c
3 @@ -334,9 +334,6 @@
6 struct globals {
7 -#if ENABLE_FEATURE_MOUNT_NFS
8 - smalluint nfs_mount_version;
9 -#endif
10 #if ENABLE_FEATURE_MOUNT_VERBOSE
11 unsigned verbose;
12 #endif
13 @@ -345,7 +342,7 @@
14 } FIX_ALIASING;
15 enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_buf) };
16 #define G (*(struct globals*)&bb_common_bufsiz1)
17 -#define nfs_mount_version (G.nfs_mount_version)
18 +#define nfs_mount_version 4 /* assume kernel>= 2.4, use v4 nfs mount protocol */
19 #if ENABLE_FEATURE_MOUNT_VERBOSE
20 #define verbose (G.verbose )
21 #else
22 @@ -993,7 +990,8 @@
23 static void
24 find_kernel_nfs_mount_version(void)
25 {
26 - int kernel_version;
27 +#if 0
28 + int kernel_version;
30 if (nfs_mount_version)
31 return;
32 @@ -1006,6 +1004,7 @@
33 nfs_mount_version = 3;
34 /* else v4 since 2.3.99pre4 */
35 }
36 +#endif
37 }
39 static void