diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_sync.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c index 7461eeb3a3dd..7ea2d981a932 100644 --- a/net/ipv4/ipvs/ip_vs_sync.c +++ b/net/ipv4/ipvs/ip_vs_sync.c | |||
@@ -849,10 +849,12 @@ int start_sync_thread(int state, char *mcast_ifn, __u8 syncid) | |||
849 | 849 | ||
850 | ip_vs_sync_state |= state; | 850 | ip_vs_sync_state |= state; |
851 | if (state == IP_VS_STATE_MASTER) { | 851 | if (state == IP_VS_STATE_MASTER) { |
852 | strlcpy(ip_vs_master_mcast_ifn, mcast_ifn, sizeof(ip_vs_master_mcast_ifn)); | 852 | strlcpy(ip_vs_master_mcast_ifn, mcast_ifn, |
853 | sizeof(ip_vs_master_mcast_ifn)); | ||
853 | ip_vs_master_syncid = syncid; | 854 | ip_vs_master_syncid = syncid; |
854 | } else { | 855 | } else { |
855 | strlcpy(ip_vs_backup_mcast_ifn, mcast_ifn, sizeof(ip_vs_backup_mcast_ifn)); | 856 | strlcpy(ip_vs_backup_mcast_ifn, mcast_ifn, |
857 | sizeof(ip_vs_backup_mcast_ifn)); | ||
856 | ip_vs_backup_syncid = syncid; | 858 | ip_vs_backup_syncid = syncid; |
857 | } | 859 | } |
858 | 860 | ||
@@ -880,7 +882,8 @@ int stop_sync_thread(int state) | |||
880 | 882 | ||
881 | IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, current->pid); | 883 | IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, current->pid); |
882 | IP_VS_INFO("stopping sync thread %d ...\n", | 884 | IP_VS_INFO("stopping sync thread %d ...\n", |
883 | (state == IP_VS_STATE_MASTER) ? sync_master_pid : sync_backup_pid); | 885 | (state == IP_VS_STATE_MASTER) ? |
886 | sync_master_pid : sync_backup_pid); | ||
884 | 887 | ||
885 | __set_current_state(TASK_UNINTERRUPTIBLE); | 888 | __set_current_state(TASK_UNINTERRUPTIBLE); |
886 | add_wait_queue(&stop_sync_wait, &wait); | 889 | add_wait_queue(&stop_sync_wait, &wait); |