git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
ipv4
/
ipvs
/
ip_vs_sync.c
diff --git
a/net/ipv4/ipvs/ip_vs_sync.c
b/net/ipv4/ipvs/ip_vs_sync.c
index
1bca714
..
7ea2d98
100644
(file)
--- a/
net/ipv4/ipvs/ip_vs_sync.c
+++ b/
net/ipv4/ipvs/ip_vs_sync.c
@@
-48,16
+48,16
@@
struct ip_vs_sync_conn {
/* Protocol, addresses and port numbers */
__u8 protocol; /* Which protocol (TCP/UDP) */
/* Protocol, addresses and port numbers */
__u8 protocol; /* Which protocol (TCP/UDP) */
- __
u16
cport;
- __
u16
vport;
- __
u16
dport;
- __
u32
caddr; /* client address */
- __
u32
vaddr; /* virtual address */
- __
u32
daddr; /* destination address */
+ __
be16
cport;
+ __
be16
vport;
+ __
be16
dport;
+ __
be32
caddr; /* client address */
+ __
be32
vaddr; /* virtual address */
+ __
be32
daddr; /* destination address */
/* Flags and state transition */
/* Flags and state transition */
- __
u16
flags; /* status flags */
- __
u16
state; /* state info */
+ __
be16
flags; /* status flags */
+ __
be16
state; /* state info */
/* The sequence options start here */
};
/* The sequence options start here */
};
@@
-464,7
+464,7
@@
join_mcast_group(struct sock *sk, struct in_addr *addr, char *ifname)
static int bind_mcastif_addr(struct socket *sock, char *ifname)
{
struct net_device *dev;
static int bind_mcastif_addr(struct socket *sock, char *ifname)
{
struct net_device *dev;
-
u
32 addr;
+
__be
32 addr;
struct sockaddr_in sin;
if ((dev = __dev_get_by_name(ifname)) == NULL)
struct sockaddr_in sin;
if ((dev = __dev_get_by_name(ifname)) == NULL)
@@
-657,7
+657,7
@@
static void sync_master_loop(void)
if (stop_master_sync)
break;
if (stop_master_sync)
break;
-
ssleep(1
);
+
msleep_interruptible(1000
);
}
/* clean up the sync_buff queue */
}
/* clean up the sync_buff queue */
@@
-714,7
+714,7
@@
static void sync_backup_loop(void)
if (stop_backup_sync)
break;
if (stop_backup_sync)
break;
-
ssleep(1
);
+
msleep_interruptible(1000
);
}
/* release the sending multicast socket */
}
/* release the sending multicast socket */
@@
-826,7
+826,7
@@
static int fork_sync_thread(void *startup)
if ((pid = kernel_thread(sync_thread, startup, 0)) < 0) {
IP_VS_ERR("could not create sync_thread due to %d... "
"retrying.\n", pid);
if ((pid = kernel_thread(sync_thread, startup, 0)) < 0) {
IP_VS_ERR("could not create sync_thread due to %d... "
"retrying.\n", pid);
-
ssleep(1
);
+
msleep_interruptible(1000
);
goto repeat;
}
goto repeat;
}
@@
-836,7
+836,7
@@
static int fork_sync_thread(void *startup)
int start_sync_thread(int state, char *mcast_ifn, __u8 syncid)
{
int start_sync_thread(int state, char *mcast_ifn, __u8 syncid)
{
- DECLARE_COMPLETION(startup);
+ DECLARE_COMPLETION
_ONSTACK
(startup);
pid_t pid;
if ((state == IP_VS_STATE_MASTER && sync_master_pid) ||
pid_t pid;
if ((state == IP_VS_STATE_MASTER && sync_master_pid) ||
@@
-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) {
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 {
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;
}
ip_vs_backup_syncid = syncid;
}
@@
-860,7
+862,7
@@
int start_sync_thread(int state, char *mcast_ifn, __u8 syncid)
if ((pid = kernel_thread(fork_sync_thread, &startup, 0)) < 0) {
IP_VS_ERR("could not create fork_sync_thread due to %d... "
"retrying.\n", pid);
if ((pid = kernel_thread(fork_sync_thread, &startup, 0)) < 0) {
IP_VS_ERR("could not create fork_sync_thread due to %d... "
"retrying.\n", pid);
-
ssleep(1
);
+
msleep_interruptible(1000
);
goto repeat;
}
goto repeat;
}
@@
-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",
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);
__set_current_state(TASK_UNINTERRUPTIBLE);
add_wait_queue(&stop_sync_wait, &wait);