rpms/nfs-utils/F-10 nfs-utils-1.1.4-statd-unlink.patch, NONE, 1.1 nfs-utils.spec, 1.193, 1.194

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16637

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-statd-unlink.patch 
Log Message:
statd: not unlinking up host files


nfs-utils-1.1.4-statd-unlink.patch:

--- NEW FILE nfs-utils-1.1.4-statd-unlink.patch ---
commit f8536d0e210a8151900f8c68185927790239eb62
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Dec 6 09:30:43 2008 -0500

    statd: not unlinking up host files
    
    Statd is not unlinking host files during SM_UNMON and
    SM_UNMON_ALL calls because the given host is still on the run-time
    notify list (rtnl) and the check flag is set when xunlink() is
    called. But the next thing the caller of xunlink() does is
    remove the host from the rtnl list which means the
    unlink will never happen.
    
    So in cases where xunlink() is immediately follow by a call
    to nlist_free() (which removes the host from the list) the
    check flag to xunlink() is not set.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c
index a6a1d9c..7d6e4da 100644
--- a/utils/statd/monitor.c
+++ b/utils/statd/monitor.c
@@ -352,7 +352,7 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp)
 			/* PRC: do the HA callout: */
 			ha_callout("del-client", mon_name, my_name, -1);
 
-			xunlink(SM_DIR, clnt->dns_name, 1);
+			xunlink(SM_DIR, clnt->dns_name, 0);
 			nlist_free(&rtnl, clnt);
 
 			return (&result);
@@ -404,7 +404,7 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp)
 			temp = NL_NEXT(clnt);
 			/* PRC: do the HA callout: */
 			ha_callout("del-client", mon_name, my_name, -1);
-			xunlink(SM_DIR, clnt->dns_name, 1);
+			xunlink(SM_DIR, clnt->dns_name, 0);
 			nlist_free(&rtnl, clnt);
 			++count;
 			clnt = temp;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-10/nfs-utils.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- nfs-utils.spec	6 Dec 2008 13:52:40 -0000	1.193
+++ nfs-utils.spec	8 Dec 2008 13:23:34 -0000	1.194
@@ -26,6 +26,7 @@
 Patch01: nfs-utils-1.1.0-smnotify-path.patch
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 Patch03: nfs-utils-1.1.4-sm-notify-typo.patch
+Patch04: nfs-utils-1.1.4-statd-unlink.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -80,6 +81,7 @@
 %patch01 -p1
 %patch02 -p1
 %patch03 -p1
+%patch04 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -243,8 +245,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Sat Dec  6 2008 Steve Dickson <steved at redhat.com> 1.1.4-3
+* Mon Dec  8 2008 Steve Dickson <steved at redhat.com> 1.1.4-3
 - sm-notify: always exiting without any notification.
+- statd: not unlinking up host files
 
 * Mon Dec  1 2008 Steve Dickson <steved at redhat.com> 1.1.4-2
 - Make sure /proc/fs/nfsd exists when the nfs init script