From 603f8c6bb9fe4a1c7e41c0dacc2681747bfe6e4e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 8 Aug 2012 08:51:12 -0700 Subject: [PATCH] 3.0-stable patches added patches: redefine-atomic_init-and-atomic64_init-to-drop-the-casts.patch sunrpc-return-negative-value-in-case-rpcbind-client-creation-error.patch --- ...-and-atomic64_init-to-drop-the-casts.patch | 68 +++++++++++++++++++ queue-3.0/series | 2 + ...n-case-rpcbind-client-creation-error.patch | 42 ++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 queue-3.0/redefine-atomic_init-and-atomic64_init-to-drop-the-casts.patch create mode 100644 queue-3.0/series create mode 100644 queue-3.0/sunrpc-return-negative-value-in-case-rpcbind-client-creation-error.patch diff --git a/queue-3.0/redefine-atomic_init-and-atomic64_init-to-drop-the-casts.patch b/queue-3.0/redefine-atomic_init-and-atomic64_init-to-drop-the-casts.patch new file mode 100644 index 00000000000..b60beb470f7 --- /dev/null +++ b/queue-3.0/redefine-atomic_init-and-atomic64_init-to-drop-the-casts.patch @@ -0,0 +1,68 @@ +From a119365586b0130dfea06457f584953e0ff6481d Mon Sep 17 00:00:00 2001 +From: Tony Luck +Date: Thu, 26 Jul 2012 10:55:26 -0700 +Subject: [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts + +From: Tony Luck + +commit a119365586b0130dfea06457f584953e0ff6481d upstream. + +The following build error occured during a ia64 build with +swap-over-NFS patches applied. + +net/core/sock.c:274:36: error: initializer element is not constant +net/core/sock.c:274:36: error: (near initialization for 'memalloc_socks') +net/core/sock.c:274:36: error: initializer element is not constant + +This is identical to a parisc build error. Fengguang Wu, Mel Gorman +and James Bottomley did all the legwork to track the root cause of +the problem. This fix and entire commit log is shamelessly copied +from them with one extra detail to change a dubious runtime use of +ATOMIC_INIT() to atomic_set() in drivers/char/mspec.c + +Dave Anglin says: +> Here is the line in sock.i: +> +> struct static_key memalloc_socks = ((struct static_key) { .enabled = +> ((atomic_t) { (0) }) }); + +The above line contains two compound literals. It also uses a designated +initializer to initialize the field enabled. A compound literal is not a +constant expression. + +The location of the above statement isn't fully clear, but if a compound +literal occurs outside the body of a function, the initializer list must +consist of constant expressions. + +Signed-off-by: Tony Luck +Signed-off-by: Greg Kroah-Hartman + +--- + arch/ia64/include/asm/atomic.h | 4 ++-- + drivers/char/mspec.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/arch/ia64/include/asm/atomic.h ++++ b/arch/ia64/include/asm/atomic.h +@@ -18,8 +18,8 @@ + #include + + +-#define ATOMIC_INIT(i) ((atomic_t) { (i) }) +-#define ATOMIC64_INIT(i) ((atomic64_t) { (i) }) ++#define ATOMIC_INIT(i) { (i) } ++#define ATOMIC64_INIT(i) { (i) } + + #define atomic_read(v) (*(volatile int *)&(v)->counter) + #define atomic64_read(v) (*(volatile long *)&(v)->counter) +--- a/drivers/char/mspec.c ++++ b/drivers/char/mspec.c +@@ -284,7 +284,7 @@ mspec_mmap(struct file *file, struct vm_ + vdata->flags = flags; + vdata->type = type; + spin_lock_init(&vdata->lock); +- vdata->refcnt = ATOMIC_INIT(1); ++ atomic_set(&vdata->refcnt, 1); + vma->vm_private_data = vdata; + + vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP | VM_DONTEXPAND); diff --git a/queue-3.0/series b/queue-3.0/series new file mode 100644 index 00000000000..814a7772c0f --- /dev/null +++ b/queue-3.0/series @@ -0,0 +1,2 @@ +redefine-atomic_init-and-atomic64_init-to-drop-the-casts.patch +sunrpc-return-negative-value-in-case-rpcbind-client-creation-error.patch diff --git a/queue-3.0/sunrpc-return-negative-value-in-case-rpcbind-client-creation-error.patch b/queue-3.0/sunrpc-return-negative-value-in-case-rpcbind-client-creation-error.patch new file mode 100644 index 00000000000..2b1930b5248 --- /dev/null +++ b/queue-3.0/sunrpc-return-negative-value-in-case-rpcbind-client-creation-error.patch @@ -0,0 +1,42 @@ +From caea33da898e4e14f0ba58173e3b7689981d2c0b Mon Sep 17 00:00:00 2001 +From: Stanislav Kinsbursky +Date: Fri, 20 Jul 2012 15:57:48 +0400 +Subject: SUNRPC: return negative value in case rpcbind client creation error + +From: Stanislav Kinsbursky + +commit caea33da898e4e14f0ba58173e3b7689981d2c0b upstream. + +Without this patch kernel will panic on LockD start, because lockd_up() checks +lockd_up_net() result for negative value. +From my pow it's better to return negative value from rpcbind routines instead +of replacing all such checks like in lockd_up(). + +Signed-off-by: Stanislav Kinsbursky +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman + +--- + net/sunrpc/rpcb_clnt.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/net/sunrpc/rpcb_clnt.c ++++ b/net/sunrpc/rpcb_clnt.c +@@ -193,7 +193,7 @@ static int rpcb_create_local_unix(void) + if (IS_ERR(clnt)) { + dprintk("RPC: failed to create AF_LOCAL rpcbind " + "client (errno %ld).\n", PTR_ERR(clnt)); +- result = -PTR_ERR(clnt); ++ result = PTR_ERR(clnt); + goto out; + } + +@@ -242,7 +242,7 @@ static int rpcb_create_local_net(void) + if (IS_ERR(clnt)) { + dprintk("RPC: failed to create local rpcbind " + "client (errno %ld).\n", PTR_ERR(clnt)); +- result = -PTR_ERR(clnt); ++ result = PTR_ERR(clnt); + goto out; + } + -- 2.47.2