diff --git a/[refs] b/[refs]
index a151ce8914c1..feb6be54d6e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7ef19560f496fd3942e41e728950e5b5c9a461b
+refs/heads/master: 3e9d41543b16e6117267edc0ca058c40f888d81a
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 7ff23707256a..3f281a857e38 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -2191,7 +2191,7 @@ static void buf_to_pages(const void *buf, size_t buflen,
 struct nfs4_cached_acl {
 	int cached;
 	size_t len;
-	char data[];
+	char data[0];
 };
 
 static void nfs4_set_cached_acl(struct inode *inode, struct nfs4_cached_acl *acl)