From cc0004927ac6bfcc47c9fc04f7987fccd71c71fd Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Sun, 10 Dec 2006 22:36:18 -0800 Subject: [PATCH] --- yaml --- r: 44291 b: refs/heads/master c: 37004af3aaf28f39981754a05cf74361c0834a7a h: refs/heads/master i: 44289: 5b5bbabb21027174a06d5a8adf9c53b759e9026b 44287: 39ae60f601a6c6a3f5c79a1666466dd65a36d1c2 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipvs/ip_vs_sync.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1a005e9b725c..0a8fa5796aab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89eaeb09ba01632511f69ce8e14c8d2abd2dbe9e +refs/heads/master: 37004af3aaf28f39981754a05cf74361c0834a7a diff --git a/trunk/net/ipv4/ipvs/ip_vs_sync.c b/trunk/net/ipv4/ipvs/ip_vs_sync.c index 7461eeb3a3dd..7ea2d981a932 100644 --- a/trunk/net/ipv4/ipvs/ip_vs_sync.c +++ b/trunk/net/ipv4/ipvs/ip_vs_sync.c @@ -849,10 +849,12 @@ int start_sync_thread(int state, char *mcast_ifn, __u8 syncid) ip_vs_sync_state |= state; if (state == IP_VS_STATE_MASTER) { - strlcpy(ip_vs_master_mcast_ifn, mcast_ifn, sizeof(ip_vs_master_mcast_ifn)); + strlcpy(ip_vs_master_mcast_ifn, mcast_ifn, + sizeof(ip_vs_master_mcast_ifn)); ip_vs_master_syncid = syncid; } else { - strlcpy(ip_vs_backup_mcast_ifn, mcast_ifn, sizeof(ip_vs_backup_mcast_ifn)); + strlcpy(ip_vs_backup_mcast_ifn, mcast_ifn, + sizeof(ip_vs_backup_mcast_ifn)); ip_vs_backup_syncid = syncid; } @@ -880,7 +882,8 @@ int stop_sync_thread(int state) IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, current->pid); IP_VS_INFO("stopping sync thread %d ...\n", - (state == IP_VS_STATE_MASTER) ? sync_master_pid : sync_backup_pid); + (state == IP_VS_STATE_MASTER) ? + sync_master_pid : sync_backup_pid); __set_current_state(TASK_UNINTERRUPTIBLE); add_wait_queue(&stop_sync_wait, &wait);