ceph: fix clang warning for CEPH_DEFINE_OID_ONSTACK
PATCH 1/1 ceph: fix clang warning for CEPH_DEFINE_OID_ONSTACK
clang complains about assigning a variable to itself during the declaration:
fs/ceph/ioctl.c:187:26: error: variable 'oid' is uninitialized when used within its own initialization [-Werror,-Wuninitialized]
CEPH_DEFINE_OID_ONSTACK(oid);
^~~include/linux/ceph/osdmap.h:122:52: note: expanded from macro 'CEPH_DEFINE_OID_ONSTACK'
struct ceph_object_id oid = CEPH_OID_INIT_ONSTACK(oid)
~~~ ^~~include/linux/ceph/osdmap.h:120:29: note: expanded from macro 'CEPH_OID_INIT_ONSTACK'
({ ceph_oid_init(&oid); oid; })
^~~We use this trick in other places, but it is completely unnecessary here, as we can just use a regular struct initializer.
--- include/linux/ceph/osdmap.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
include/linux/ceph/osdmap.h +1 -3
@@ -116,10 +116,8 @@ static inline void ceph_oid_init(struct ceph_object_id *oid) oid->name_len =0 ; } -#define CEPH_OID_INIT_ONSTACK (oid) \ - ({ ceph_oid_init(&oid); oid; })#define CEPH_DEFINE_OID_ONSTACK (oid) \ - struct ceph_object_id oid = CEPH_OID_INIT_ONSTACK(oid) + struct ceph_object_id oid = { .name = oid.inline_name }static inline bool ceph_oid_empty (const struct ceph_object_id *oid) {
Signature · 1 line
2.20.0
Ilya Dryomov
maintainerQuoted 28 lines · Arnd Bergmann
clang complains about assigning a variable to itself during the declaration:
fs/ceph/ioctl.c:187:26: error: variable 'oid' is uninitialized when used within its own initialization [-Werror,-Wuninitialized]CEPH_DEFINE_OID_ONSTACK(oid); ^~~
include/linux/ceph/osdmap.h:122:52: note: expanded from macro 'CEPH_DEFINE_OID_ONSTACK'
structceph_object_idoid =CEPH_OID_INIT_ONSTACK(oid)
~~~ ^~~include/linux/ceph/osdmap.h:120:29: note: expanded from macro 'CEPH_OID_INIT_ONSTACK'({ ceph_oid_init(&oid); oid; }) ^~~We use this trick in other places, but it is completely unnecessary here, as we can just use a regular struct initializer.
Signed-off-by Arnd Bergmann <[email protected]>--- include/linux/ceph/osdmap.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)include/linux/ceph/osdmap.h +0
-0@@ -116,10 +116,8 @@ static inline void ceph_oid_init(struct ceph_object_id *oid) oid->name_len =0 ;
include/linux/ceph/osdmap.h static inline void ceph_oid_init(struct ceph_object_id *oid) · line 123
Quoted 10 lines
include/linux/ceph/osdmap.h +1
-3} -#define CEPH_OID_INIT_ONSTACK (oid) \ - ({ ceph_oid_init(&oid); oid; })#define CEPH_DEFINE_OID_ONSTACK (oid) \ - struct ceph_object_id oid = CEPH_OID_INIT_ONSTACK(oid) + struct ceph_object_id oid = { .name = oid.inline_name }static inline bool ceph_oid_empty (const struct ceph_object_id *oid) {
Hi Arnd,
I don't like this because the initialization is no longer contained to ceph_oid_init(). Now there are two things to patch instead of one.
How is this going to be fixed in other places?
Thanks,
Ilya
Quoted 9 lines · Ilya Dryomov
On Fri, Mar 22, 2019 at 3:08 PM Arnd Bergmann <[email protected]> wrote:
Hi Arnd,
I don't like this because the initialization is no longer contained to
ceph_oid_init(). Now there are two things to patch instead of one.How is this going to be fixed in other places?
The only other warning like this that I encountered was in DECLARE_WAIT_QUEUE_HEAD_ONSTACK().
So far, I have no idea for how to solve it, other than disabling CONFIG_LOCKDEP when clang is used.
Would you prefer this version?
#define CEPH_OID_INITIALIZER(oid) { .name = (oid).inline_name }
#define CEPH_DEFINE_OID_ONSTACK(oid) \
struct ceph_object_id oid = CEPH_OID_INITIALIZER(oid)
static inline void ceph_oid_init(struct ceph_object_id *oid)
{
*oid = (struct ceph_object_id)CEPH_OID_INITIALIZER(*oid);
}Arnd