From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753329AbdGJEk3 (ORCPT ); Mon, 10 Jul 2017 00:40:29 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:35745 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750785AbdGJEk2 (ORCPT ); Mon, 10 Jul 2017 00:40:28 -0400 From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: torvalds@linux-foundation.org, Florian Fainelli , Tomohiro Kusumi , Andrew Morton , Ian Kent , Ingo Molnar Subject: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename Date: Sun, 9 Jul 2017 21:40:15 -0700 Message-Id: <20170710044018.12474-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <90ca2c9c-5b48-44f2-a590-ae4e42a61376@gmail.com> References: <90ca2c9c-5b48-44f2-a590-ae4e42a61376@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit ac6424b981bce1c4bc55675c6ce11bfe1bbfa64f "("sched/wait: Rename wait_queue_t => wait_queue_entry_t") as far as the autofs user API structures are concerned since that would break user space build against such kernel headers. Fixes: ac6424b981bc ("sched/wait: Rename wait_queue_t => wait_queue_entry_t") Signed-off-by: Florian Fainelli --- include/uapi/linux/auto_fs.h | 4 ++-- include/uapi/linux/auto_fs4.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/auto_fs.h b/include/uapi/linux/auto_fs.h index 1953f8d6063b..aa63451ef20a 100644 --- a/include/uapi/linux/auto_fs.h +++ b/include/uapi/linux/auto_fs.h @@ -26,7 +26,7 @@ #define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION /* - * The wait_queue_entry_token (autofs_wqt_t) is part of a structure which is passed + * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed * back to the kernel via ioctl from userspace. On architectures where 32- and * 64-bit userspace binaries can be executed it's important that the size of * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we @@ -49,7 +49,7 @@ struct autofs_packet_hdr { struct autofs_packet_missing { struct autofs_packet_hdr hdr; - autofs_wqt_t wait_queue_entry_token; + autofs_wqt_t wait_queue_token; int len; char name[NAME_MAX+1]; }; diff --git a/include/uapi/linux/auto_fs4.h b/include/uapi/linux/auto_fs4.h index 65b72d0222e7..7c6da423d54e 100644 --- a/include/uapi/linux/auto_fs4.h +++ b/include/uapi/linux/auto_fs4.h @@ -108,7 +108,7 @@ enum autofs_notify { /* v4 multi expire (via pipe) */ struct autofs_packet_expire_multi { struct autofs_packet_hdr hdr; - autofs_wqt_t wait_queue_entry_token; + autofs_wqt_t wait_queue_token; int len; char name[NAME_MAX+1]; }; @@ -123,7 +123,7 @@ union autofs_packet_union { /* autofs v5 common packet struct */ struct autofs_v5_packet { struct autofs_packet_hdr hdr; - autofs_wqt_t wait_queue_entry_token; + autofs_wqt_t wait_queue_token; __u32 dev; __u64 ino; __u32 uid; -- 2.11.0