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