# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1818  -> 1.1819 
#	net/ipv4/ipvs/ip_vs_ctl.c	1.14    -> 1.15   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/20	brettspamacct@xxxxxxxxxxxxx	1.1819
# [IPVS]: Hold the svc lock during service update in dest edit
# --------------------------------------------
#
diff -Nru a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
--- a/net/ipv4/ipvs/ip_vs_ctl.c	Sat Mar 20 16:45:13 2004
+++ b/net/ipv4/ipvs/ip_vs_ctl.c	Sat Mar 20 16:45:13 2004
@@ -898,8 +898,12 @@
 
 	__ip_vs_update_dest(svc, dest, udest);
 
+	write_lock_bh(&__ip_vs_svc_lock);
+
 	/* call the update_service, because server weight may be changed */
 	svc->scheduler->update_service(svc);
+
+	write_unlock_bh(&__ip_vs_svc_lock);
 
 	LeaveFunction(2);