Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

2 files changed, 20 insertions, 10 deletions

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index bada1b9c670b..c18286a2167b 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -221,7 +221,7 @@ static int afiucv_pm_restore_thaw(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops afiucv_pm_ops = {
+static const struct dev_pm_ops afiucv_pm_ops = {
         .prepare = afiucv_pm_prepare,
         .complete = afiucv_pm_complete,
         .freeze = afiucv_pm_freeze,
@@ -428,7 +428,6 @@ static void iucv_sock_close(struct sock *sk)
                 break;
 
         default:
-                sock_set_flag(sk, SOCK_ZAPPED);
                 /* nothing to do here */
                 break;
         }
@@ -482,7 +481,8 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio)
 }
 
 /* Create an IUCV socket */
-static int iucv_sock_create(struct net *net, struct socket *sock, int protocol)
+static int iucv_sock_create(struct net *net, struct socket *sock, int protocol,
+                            int kern)
 {
         struct sock *sk;
 
@@ -536,7 +536,7 @@ void iucv_accept_enqueue(struct sock *parent, struct sock *sk)
         list_add_tail(&iucv_sk(sk)->accept_q, &par->accept_q);
         spin_unlock_irqrestore(&par->accept_q_lock, flags);
         iucv_sk(sk)->parent = parent;
-        parent->sk_ack_backlog++;
+        sk_acceptq_added(parent);
 }
 
 void iucv_accept_unlink(struct sock *sk)
@@ -547,7 +547,7 @@ void iucv_accept_unlink(struct sock *sk)
         spin_lock_irqsave(&par->accept_q_lock, flags);
         list_del_init(&iucv_sk(sk)->accept_q);
         spin_unlock_irqrestore(&par->accept_q_lock, flags);
-        iucv_sk(sk)->parent->sk_ack_backlog--;
+        sk_acceptq_removed(iucv_sk(sk)->parent);
         iucv_sk(sk)->parent = NULL;
         sock_put(sk);
 }
@@ -1715,7 +1715,7 @@ static const struct proto_ops iucv_sock_ops = {
         .getsockopt     = iucv_sock_getsockopt,
 };
 
-static struct net_proto_family iucv_sock_family_ops = {
+static const struct net_proto_family iucv_sock_family_ops = {
         .family = AF_IUCV,
         .owner  = THIS_MODULE,
         .create = iucv_sock_create,
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 3973d0e61e56..fd8b28361a64 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -93,7 +93,7 @@ static int iucv_pm_freeze(struct device *);
 static int iucv_pm_thaw(struct device *);
 static int iucv_pm_restore(struct device *);
 
-static struct dev_pm_ops iucv_pm_ops = {
+static const struct dev_pm_ops iucv_pm_ops = {
         .prepare = iucv_pm_prepare,
         .complete = iucv_pm_complete,
         .freeze = iucv_pm_freeze,
@@ -1768,7 +1768,6 @@ static void iucv_tasklet_fn(unsigned long ignored)
  */
 static void iucv_work_fn(struct work_struct *work)
 {
-        typedef void iucv_irq_fn(struct iucv_irq_data *);
         LIST_HEAD(work_queue);
         struct iucv_irq_list *p, *n;
 
@@ -1878,14 +1877,25 @@ int iucv_path_table_empty(void)
 static int iucv_pm_freeze(struct device *dev)
 {
         int cpu;
+        struct iucv_irq_list *p, *n;
         int rc = 0;
 
 #ifdef CONFIG_PM_DEBUG
         printk(KERN_WARNING "iucv_pm_freeze\n");
 #endif
+        if (iucv_pm_state != IUCV_PM_FREEZING) {
+                for_each_cpu_mask_nr(cpu, iucv_irq_cpumask)
+                        smp_call_function_single(cpu, iucv_block_cpu_almost,
+                                                 NULL, 1);
+                cancel_work_sync(&iucv_work);
+                list_for_each_entry_safe(p, n, &iucv_work_queue, list) {
+                        list_del_init(&p->list);
+                        iucv_sever_pathid(p->data.ippathid,
+                                          iucv_error_no_listener);
+                        kfree(p);
+                }
+        }
         iucv_pm_state = IUCV_PM_FREEZING;
-        for_each_cpu_mask_nr(cpu, iucv_irq_cpumask)
-                smp_call_function_single(cpu, iucv_block_cpu_almost, NULL, 1);
         if (dev->driver && dev->driver->pm && dev->driver->pm->freeze)
                 rc = dev->driver->pm->freeze(dev);
         if (iucv_path_table_empty())