[PATCH] autofs4: header file update

The current header file definitions for autofs version 5 have caused a couple
of problems for application builds downstream.

This fixes the problem by separating the definitions.

Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 1e4a539f4417..0d041a9cb348 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -84,7 +84,11 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
                                  struct autofs_wait_queue *wq,
                                  int type)
 {
-        union autofs_packet_union pkt;
+        union {
+                struct autofs_packet_hdr hdr;
+                union autofs_packet_union v4_pkt;
+                union autofs_v5_packet_union v5_pkt;
+        } pkt;
         size_t pktsz;
 
         DPRINTK("wait id = 0x%08lx, name = %.*s, type=%d",
@@ -98,7 +102,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
         /* Kernel protocol v4 missing and expire packets */
         case autofs_ptype_missing:
         {
-                struct autofs_packet_missing *mp = &pkt.missing;
+                struct autofs_packet_missing *mp = &pkt.v4_pkt.missing;
 
                 pktsz = sizeof(*mp);
 
@@ -110,7 +114,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
         }
         case autofs_ptype_expire_multi:
         {
-                struct autofs_packet_expire_multi *ep = &pkt.expire_multi;
+                struct autofs_packet_expire_multi *ep = &pkt.v4_pkt.expire_multi;
 
                 pktsz = sizeof(*ep);
 
@@ -129,7 +133,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
         case autofs_ptype_missing_direct:
         case autofs_ptype_expire_direct:
         {
-                struct autofs_v5_packet *packet = &pkt.v5_packet;
+                struct autofs_v5_packet *packet = &pkt.v5_pkt.v5_packet;
 
                 pktsz = sizeof(*packet);