# HG changeset patch
# User Richard Dunbar <mojo@slitaz.org>
# Date 1356105132 0
# Node ID 5b96796d9df5f6692478872566e5673bf9ce8df4
# Parent  b9dde6ba0be0b41f34788213fac5f20a868c1803
busybox: error free nfs-segfault.u

diff -r b9dde6ba0be0 -r 5b96796d9df5 busybox/stuff/busybox-1.20-nfs-segfault.u
--- a/busybox/stuff/busybox-1.20-nfs-segfault.u	Fri Dec 21 09:06:48 2012 +0100
+++ b/busybox/stuff/busybox-1.20-nfs-segfault.u	Fri Dec 21 15:52:12 2012 +0000
@@ -1,6 +1,6 @@
 --- a/util-linux/mount.c
 +++ b/util-linux/mount.c
-@@ -285,9 +285,6 @@
+@@ -320,9 +320,6 @@
  
  
  struct globals {
@@ -10,7 +10,7 @@
  #if ENABLE_FEATURE_MOUNT_VERBOSE
  	unsigned verbose;
  #endif
-@@ -296,7 +293,7 @@
+@@ -331,7 +328,7 @@
  } FIX_ALIASING;
  enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_buf) };
  #define G (*(struct globals*)&bb_common_bufsiz1)
@@ -19,19 +19,21 @@
  #if ENABLE_FEATURE_MOUNT_VERBOSE
  #define verbose           (G.verbose          )
  #else
-@@ -937,6 +934,7 @@
+@@ -972,7 +969,8 @@
  static void
  find_kernel_nfs_mount_version(void)
  {
+-	int kernel_version;
 +#if 0
- 	int kernel_version;
++		int kernel_version;
  
  	if (nfs_mount_version)
-@@ -950,6 +948,7 @@
+ 		return;
+@@ -985,6 +983,7 @@
  			nfs_mount_version = 3;
  		/* else v4 since 2.3.99pre4 */
  	}
-+#endif
++#endif	
  }
  
- static void
\ No newline at end of file
+ static void