wok-next annotate busybox/stuff/busybox-1.20-nfs-segfault.u @ rev 13806
Up: gimp-brushes
| author | Alexander Medvedev <devl547@gmail.com> |
|---|---|
| date | Sun Jan 06 05:39:53 2013 +0300 (2013-01-06) |
| parents | 77850ece4ff6 |
| children |
| rev | line source |
|---|---|
| mojo@13725 | 1 --- a/util-linux/mount.c |
| mojo@13725 | 2 +++ b/util-linux/mount.c |
| mojo@13727 | 3 @@ -320,9 +320,6 @@ |
| mojo@13725 | 4 |
| mojo@13725 | 5 |
| mojo@13725 | 6 struct globals { |
| mojo@13725 | 7 -#if ENABLE_FEATURE_MOUNT_NFS |
| mojo@13725 | 8 - smalluint nfs_mount_version; |
| mojo@13725 | 9 -#endif |
| mojo@13725 | 10 #if ENABLE_FEATURE_MOUNT_VERBOSE |
| mojo@13725 | 11 unsigned verbose; |
| mojo@13725 | 12 #endif |
| mojo@13727 | 13 @@ -331,7 +328,7 @@ |
| mojo@13725 | 14 } FIX_ALIASING; |
| mojo@13725 | 15 enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_buf) }; |
| mojo@13725 | 16 #define G (*(struct globals*)&bb_common_bufsiz1) |
| mojo@13725 | 17 -#define nfs_mount_version (G.nfs_mount_version) |
| mojo@13725 | 18 +#define nfs_mount_version 4 /* assume kernel>= 2.4, use v4 nfs mount protocol */ |
| mojo@13725 | 19 #if ENABLE_FEATURE_MOUNT_VERBOSE |
| mojo@13725 | 20 #define verbose (G.verbose ) |
| mojo@13725 | 21 #else |
| mojo@13727 | 22 @@ -972,7 +969,8 @@ |
| mojo@13725 | 23 static void |
| mojo@13725 | 24 find_kernel_nfs_mount_version(void) |
| mojo@13725 | 25 { |
| mojo@13727 | 26 - int kernel_version; |
| mojo@13725 | 27 +#if 0 |
| mojo@13727 | 28 + int kernel_version; |
| mojo@13725 | 29 |
| mojo@13725 | 30 if (nfs_mount_version) |
| mojo@13727 | 31 return; |
| mojo@13727 | 32 @@ -985,6 +983,7 @@ |
| mojo@13725 | 33 nfs_mount_version = 3; |
| mojo@13725 | 34 /* else v4 since 2.3.99pre4 */ |
| mojo@13725 | 35 } |
| mojo@13727 | 36 +#endif |
| mojo@13725 | 37 } |
| mojo@13725 | 38 |
| mojo@13727 | 39 static void |