From bce4e27b67fcc25fd966161c3270cc94d0771c6d Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Nov 20 2009 14:02:51 +0000
Subject: - Fixed a bug in v4root code that was causing ESTALE mounts (bz 538609)


---

diff --git a/nfs-utils-1.2.0-v4root-bz538609.patch b/nfs-utils-1.2.0-v4root-bz538609.patch
new file mode 100644
index 0000000..9e29e08
--- /dev/null
+++ b/nfs-utils-1.2.0-v4root-bz538609.patch
@@ -0,0 +1,28 @@
+commit 3c473bf19432cd7c17c7be7595d46e7c2d6a7efe
+Author: Steve Dickson <steved@redhat.com>
+Date:   Fri Nov 20 08:51:34 2009 -0500
+
+    Fixed a bug introduced by commit 5d27b4 that was stopping
+    exports that existed on the pseudo root (i.e. '/') from
+    being exported. The result of this bug was client mounts
+    were failing with ESTALE.
+    
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
+index a1e0eb2..a5a1a75 100644
+--- a/utils/mountd/v4root.c
++++ b/utils/mountd/v4root.c
+@@ -275,8 +275,10 @@ v4root_create(char *path, nfs_export *exp)
+ 
+ 	/* Check to see if the export already exists */
+ 	get_uuid(path, NULL, uuid_len, uuid);
+-	if ((p_export = v4root_export(uuid, uuid_len)) != NULL)
+-		return p_export;
++	if ((p_export = v4root_export(uuid, uuid_len)) != NULL) {
++		if (strcmp(path, p_export->e_path) == 0)
++			return p_export;
++	}
+ 
+ 	pexp = (exports_t *)malloc(sizeof(exports_t));
+ 	if (pexp == NULL) {
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 8ece9d1..5a1dcef 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -22,9 +22,11 @@ Patch00: nfs-utils-1.0.5-statdpath.patch
 Patch01: nfs-utils-1.1.0-smnotify-path.patch
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 
-Patch200: nfs-utils-1.2.0-v4root-rel8.patch
-Patch201: nfs-utils-1.2.0-mount-default.patch
-Patch202: nfs-utils-1.2.1-nfsd-bootfail.patch
+Patch200: nfs-utils-1.2.0-mount-default.patch
+Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
+
+Patch300: nfs-utils-1.2.0-v4root-rel8.patch
+Patch301: nfs-utils-1.2.0-v4root-bz538609.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -78,7 +80,9 @@ This package also contains the mount.nfs and umount.nfs program.
 
 %patch200 -p1
 %patch201 -p1
-%patch202 -p1
+
+%patch300 -p1
+%patch301 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -250,6 +254,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Nov 20 2009 Steve Dickson <steved@redhat.com> 1.2.1-2
+- Fixed a bug in v4root code that was causing ESTALE mounts
+  (bz 538609)
+
 * Fri Nov 13 2009  Steve Dickson <steved@redhat.com> 1.2.1-1
 - Updated to latest upstream release 1.2.1
 - Updated to the latest pseudo root release (rel8).