Skip to contentSkip to conversation

vfs: workaround gcc <4.6 build error in link_path_walk()

PATCH In review James Hogan 2 participants 3 messages Sep 16, 2014 – Sep 17, 2014 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vfs: workaround gcc <4.6 build error in link_path_walk()

Commit d6bb3e9075bb (vfs: simplify and shrink stack frame of link_path_walk()) introduced build problems with GCC versions older than 4.6 due to the initialisation of a member of an anonymous union in struct qstr without enclosing braces.

This hits GCC bug 10676 [1] (which was fixed in GCC 4.6 by [2]), and causes the following build error:
fs/namei.c: In function 'link_path_walk':
fs/namei.c:1778: error: unknown field 'hash_len' specified in initializer

This is worked around by adding explicit braces.

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676
[2] https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=159206

Fixes d6bb3e9075bb (vfs: simplify and shrink stack frame of link_path_walk())
Cc Linus Torvalds <[email protected]>
Cc Alexander Viro <[email protected]>
Cc Geert Uytterhoeven <[email protected]>

---
At least for metag it's feasible to fix the compiler, since backporting the fix to GCC 4.2.4 isn't actually very difficult. I don't know about other users of GCC <4.6 though.

---
 fs/namei.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/namei.c +1 -1
index 01d03892316c..a7b05bf82d31 100644
@@ -1775,7 +1775,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 			struct dentry *parent = nd->path.dentry;
 			nd->flags &= ~LOOKUP_JUMPED;
 			if (unlikely(parent->d_flags & DCACHE_OP_HASH)) {
-				struct qstr this = { .hash_len = hash_len, .name = name };
+				struct qstr this = { { .hash_len = hash_len }, .name = name };
 				err = parent->d_op->d_hash(parent, &this);
 				if (err < 0)
 					break;
Signature · 1 line
1.8.5.5
maintainer
#1 lore raw
Quoted 11 lines · James Hogan

Commit d6bb3e9075bb (vfs: simplify and shrink stack frame of link_path_walk()) introduced build problems with GCC versions older than 4.6 due to the initialisation of a member of an anonymous union in struct qstr without enclosing braces.

This hits GCC bug 10676 [1] (which was fixed in GCC 4.6 by [2]), and causes the following build error:
fs/namei.c: In function 'link_path_walk':
fs/namei.c:1778: error: unknown field 'hash_len' specified in initializer

This is worked around by adding explicit braces.

IOW, the same thing QSTR_INIT is doing... BTW, after looking at the commit in question, what the hell was this
+ name = this.name;
in link_path_walk() about? Granted, none of the ->d_hash() instances in the tree reassign qstr->name, and out-of-tree ones are unlikely to do it either, so it's harmless but... why bother rereading this.name at all? Linus?

#2 lore raw
Quoted 6 lines · Al Viro
Quoted 5 lines · James Hogan

Commit d6bb3e9075bb (vfs: simplify and shrink stack frame of link_path_walk()) introduced build problems with GCC versions older than 4.6 due to the initialisation of a member of an anonymous union in struct qstr without enclosing braces.

Quoted 8 lines
Quoted 6 lines

This hits GCC bug 10676 [1] (which was fixed in GCC 4.6 by [2]), and causes the following build error:
fs/namei.c: In function 'link_path_walk':
fs/namei.c:1778: error: unknown field 'hash_len' specified in initializer

This is worked around by adding explicit braces.

IOW, the same thing QSTR_INIT is doing...

QSTR_INIT only initialises len and name, not the hash.

Cheers
James