The patch titled
Subject: fs/nfs/nfs4state.c: work around gcc-4.4.4 union initializer bug
has been removed from the -mm tree. Its filename was
fs-nfs-nfs4statec-work-around-gcc-444-union-initializer-bug.patch
This patch was dropped because an alternative patch was merged
------------------------------------------------------
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Subject: fs/nfs/nfs4state.c: work around gcc-4.4.4 union initializer bug
Reported-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
Tested-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Cc: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nfs/nfs4state.c | 3 +--
include/linux/nfs4.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff -puN fs/nfs/nfs4state.c~fs-nfs-nfs4statec-work-around-gcc-444-union-initializer-bug fs/nfs/nfs4state.c
--- a/fs/nfs/nfs4state.c~fs-nfs-nfs4statec-work-around-gcc-444-union-initializer-bug
+++ a/fs/nfs/nfs4state.c
@@ -71,8 +71,7 @@ const nfs4_stateid zero_stateid = {
};
const nfs4_stateid invalid_stateid = {
{
- .seqid = cpu_to_be32(0xffffffffU),
- .other = { 0 },
+ { .seqid = cpu_to_be32(0xffffffffU), .other = { 0 }, },
},
.type = NFS4_INVALID_STATEID_TYPE,
};
diff -puN include/linux/nfs4.h~fs-nfs-nfs4statec-work-around-gcc-444-union-initializer-bug include/linux/nfs4.h
--- a/include/linux/nfs4.h~fs-nfs-nfs4statec-work-around-gcc-444-union-initializer-bug
+++ a/include/linux/nfs4.h
@@ -53,11 +53,11 @@ typedef struct { char data[NFS4_VERIFIER
struct nfs4_stateid_struct {
union {
- char data[NFS4_STATEID_SIZE];
struct {
__be32 seqid;
char other[NFS4_STATEID_OTHER_SIZE];
} __attribute__ ((packed));
+ char data[NFS4_STATEID_SIZE];
};
enum {
_
Patches currently in -mm which might be from torvalds@xxxxxxxxxxxxxxxxxxxx are
workaround-for-a-pci-restoring-bug.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
