linux-next: build failure after merge of the akpm-current tree

Stephen Rothwell
2014-03-25T07:45:05Z

[-- Attachment #1: Type: text/plain, Size: 2153 bytes --]

Hi Andrew,

After merging the akpm-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/thread_info.h:11:0,
from arch/x86/include/asm/preempt.h:6,
from include/linux/preempt.h:18,
from include/linux/spinlock.h:50,
from fs/ocfs2/stackglue.c:22:
include/linux/bug.h:33:45: error: negative width in bit-field '<anonymous>'
#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
^
include/linux/kernel.h:848:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
BUILD_BUG_ON_ZERO((perms) > 0777) + \
^
include/linux/sysfs.h:75:12: note: in expansion of macro 'VERIFY_OCTAL_PERMISSIONS'
.mode = VERIFY_OCTAL_PERMISSIONS(_mode) }, \
^
fs/ocfs2/stackglue.c:614:2: note: in expansion of macro '__ATTR'
__ATTR(dlm_recover_callback_support, S_IFREG | S_IRUGO,
^

Caused by commit 88991182643c ("ocfs2: add dlm_recover_callback_support
in sysfs") interacting with commit 58f86cc89c33
("VERIFY_OCTAL_PERMISSIONS: stricter checking for sysfs perms") from the
modules tree.

I applied this fix up patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Mar 2014 18:39:49 +1100
Subject: [PATCH] ocfs2: VERIFY_OCTAL_PERMISSIONS fix up

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/ocfs2/stackglue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index c8c9d54dabc5..5e4d314c854d 100644
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c
@@ -611,7 +611,7 @@ static ssize_t ocfs2_dlm_recover_show(struct kobject *kobj,
}

static struct kobj_attribute ocfs2_attr_dlm_recover_support =
- __ATTR(dlm_recover_callback_support, S_IFREG | S_IRUGO,
+ __ATTR(dlm_recover_callback_support, S_IRUGO,
ocfs2_dlm_recover_show, NULL);

static struct attribute *ocfs2_attrs[] = {
--
1.9.1

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]