Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1683949 > unrolled thread

Re: [GIT PULL] scheduler changes for v4.13

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [GIT PULL] scheduler changes for v4.13 Florian Fainelli <f.fainelli@gmail.com> - 2017-07-10 06:30 +0200
    [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename Florian Fainelli <f.fainelli@gmail.com> - 2017-07-10 06:50 +0200
      Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename Ingo Molnar <mingo@kernel.org> - 2017-07-10 10:50 +0200
      Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename kbuild test robot <lkp@intel.com> - 2017-07-10 11:50 +0200
      Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename Gabriel C <nix.or.die@gmail.com> - 2017-07-10 16:10 +0200
        Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename Florian Fainelli <f.fainelli@gmail.com> - 2017-07-10 18:00 +0200
        Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename Linus Torvalds <torvalds@linux-foundation.org> - 2017-07-10 20:50 +0200
          Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename Florian Fainelli <f.fainelli@gmail.com> - 2017-07-11 01:10 +0200
    Re: [GIT PULL] scheduler changes for v4.13 Ingo Molnar <mingo@kernel.org> - 2017-07-10 10:50 +0200

#1683949 — Re: [GIT PULL] scheduler changes for v4.13

On 07/03/2017 01:39 AM, Ingo Molnar wrote:
> Linus,
> 
> Please pull the latest sched-core-for-linus git tree from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-core-for-linus
> 
>    # HEAD: 72298e5c92c50edd8cb7cfda4519483ce65fa166 sched/cputime: Refactor the cputime_adjust() code
> 
> The main changes in this cycle were:
> 
>  - Add the SYSTEM_SCHEDULING bootup state to move various scheduler debug checks 
>    earlier into the bootup. This turns silent and sporadically deadly bugs into
>    nice, deterministic splats. Fix some of the splats that triggered.
>    (Thomas Gleixner)
> 
>  - A round of restructuring and refactoring of the load-balancing and topology 
>    code (Peter Zijlstra)
> 
>  - Another round of consolidating ~20 of incremental scheduler code history: this 
>    time in terms of wait-queue nomenclature. (I didn't get much feedback on these 
>    renaming patches, and we can still easily change any names I might have 
>    misplaced, so if anyone hates a new name, please holler and I'll fix it.)
>    (Ingo Molnar)

This commit ac6424b981bce1c4bc55675c6ce11bfe1bbfa64f ("sched/wait:
Rename wait_queue_t => wait_queue_entry_t") ends up renaming the
autofs_packet_missing, autofs_packet_expire_multi and autofs_v5_packet
member previously named wait_queue_entry to wait_queue_entry_token. Was
it intentional to force an user space build breakage when building
against v4.13-rc headers for autofs headers?

Thanks
-- 
Florian

[toc] | [next] | [standalone]

#1683954 — [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename

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 <f.fainelli@gmail.com>
---
 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

[toc] | [prev] | [next] | [standalone]

#1684052 — Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename

* Florian Fainelli <f.fainelli@gmail.com> wrote:

> 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 <f.fainelli@gmail.com>

Acked-by: Ingo Molnar <mingo@kernel.org>

Thanks,

	Ingo

[toc] | [prev] | [next] | [standalone]

#1684103 — Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename

[Multipart message — attachments visible in raw view] — view raw

Hi Florian,

[auto build test ERROR on linus/master]
[also build test ERROR on next-20170710]
[cannot apply to v4.12]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Florian-Fainelli/autofs-Revert-wait_queue_t-wait_queue_entry_t-rename/20170710-140256
config: x86_64-randconfig-b0-07101640 (attached as .config)
compiler: gcc-4.4 (Debian 4.4.7-8) 4.4.7
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   fs/autofs4/waitq.c: In function 'autofs4_notify_daemon':
>> fs/autofs4/waitq.c:123: error: 'struct autofs_packet_missing' has no member named 'wait_queue_entry_token'
>> fs/autofs4/waitq.c:136: error: 'struct autofs_packet_expire_multi' has no member named 'wait_queue_entry_token'
>> fs/autofs4/waitq.c:156: error: 'struct autofs_v5_packet' has no member named 'wait_queue_entry_token'

vim +123 fs/autofs4/waitq.c


:::::: The code at line 123 was first introduced by commit
:::::: ac6424b981bce1c4bc55675c6ce11bfe1bbfa64f sched/wait: Rename wait_queue_t => wait_queue_entry_t

:::::: TO: Ingo Molnar <mingo@kernel.org>
:::::: CC: Ingo Molnar <mingo@kernel.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[toc] | [prev] | [next] | [standalone]

#1684274 — Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename

Hi,

2017-07-10 6:40 GMT+02:00 Florian Fainelli <f.fainelli@gmail.com>:
> 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 <f.fainelli@gmail.com>
> ---
>  include/uapi/linux/auto_fs.h  | 4 ++--
>  include/uapi/linux/auto_fs4.h | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)

You need revert a lot more .. that won't even compile.

Looks like someone used some script to convert these :)

Something like this :

From 35d689b39286f94ded7609b5bed9ff0232958f9d Mon Sep 17 00:00:00 2001
From: Gabriel Craciunescu <crazy@frugalware.org>
Date: Mon, 10 Jul 2017 15:48:57 +0200
Subject: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename

This reverts aufs parts of 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: Gabriel Craciunescu <nix.or.die@gmail.com>
---
 Documentation/filesystems/autofs4.txt | 12 ++++++------
 fs/autofs4/autofs_i.h                 |  2 +-
 fs/autofs4/waitq.c                    | 18 +++++++++---------
 include/uapi/linux/auto_fs.h          |  4 ++--
 include/uapi/linux/auto_fs4.h         |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Documentation/filesystems/autofs4.txt
b/Documentation/filesystems/autofs4.txt
index 8444dc3d57e8..f10dd590f69f 100644
--- a/Documentation/filesystems/autofs4.txt
+++ b/Documentation/filesystems/autofs4.txt
@@ -316,7 +316,7 @@ For version 5, the format of the message is:
         struct autofs_v5_packet {
                 int proto_version;                /* Protocol version */
                 int type;                        /* Type of packet */
-                autofs_wqt_t wait_queue_entry_token;
+                autofs_wqt_t wait_queue_token;
                 __u32 dev;
                 __u64 ino;
                 __u32 uid;
@@ -341,12 +341,12 @@ The pipe will be set to "packet mode"
(equivalent to passing
 `O_DIRECT`) to _pipe2(2)_ so that a read from the pipe will return at
 most one packet, and any unread portion of a packet will be discarded.

-The `wait_queue_entry_token` is a unique number which can identify a
+The `wait_queue_token` is a unique number which can identify a
 particular request to be acknowledged.  When a message is sent over
 the pipe the affected dentry is marked as either "active" or
 "expiring" and other accesses to it block until the message is
 acknowledged using one of the ioctls below and the relevant
-`wait_queue_entry_token`.
+`wait_queue_token`.

 Communicating with autofs: root directory ioctls
 ------------------------------------------------
@@ -358,7 +358,7 @@ capability, or must be the automount daemon.
 The available ioctl commands are:

 - **AUTOFS_IOC_READY**: a notification has been handled.  The argument
-    to the ioctl command is the "wait_queue_entry_token" number
+    to the ioctl command is the "wait_queue_token" number
     corresponding to the notification being acknowledged.
 - **AUTOFS_IOC_FAIL**: similar to above, but indicates failure with
     the error code `ENOENT`.
@@ -382,14 +382,14 @@ The available ioctl commands are:
         struct autofs_packet_expire_multi {
                 int proto_version;              /* Protocol version */
                 int type;                       /* Type of packet */
-                autofs_wqt_t wait_queue_entry_token;
+                autofs_wqt_t wait_queue_token;
                 int len;
                 char name[NAME_MAX+1];
         };

      is required.  This is filled in with the name of something
      that can be unmounted or removed.  If nothing can be expired,
-     `errno` is set to `EAGAIN`.  Even though a `wait_queue_entry_token`
+     `errno` is set to `EAGAIN`.  Even though a `wait_queue_token`
      is present in the structure, no "wait queue" is established
      and no acknowledgment is needed.
 - **AUTOFS_IOC_EXPIRE_MULTI**:  This is similar to
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
index 974f5346458a..beef981aa54f 100644
--- a/fs/autofs4/autofs_i.h
+++ b/fs/autofs4/autofs_i.h
@@ -83,7 +83,7 @@ struct autofs_info {
 struct autofs_wait_queue {
  wait_queue_head_t queue;
  struct autofs_wait_queue *next;
- autofs_wqt_t wait_queue_entry_token;
+ autofs_wqt_t wait_queue_token;
  /* We use the following to see what we are waiting for */
  struct qstr name;
  u32 dev;
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 7071895b0678..24a58bf9ca72 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -104,7 +104,7 @@ static void autofs4_notify_daemon(struct
autofs_sb_info *sbi,
  size_t pktsz;

  pr_debug("wait id = 0x%08lx, name = %.*s, type=%d\n",
- (unsigned long) wq->wait_queue_entry_token,
+ (unsigned long) wq->wait_queue_token,
  wq->name.len, wq->name.name, type);

  memset(&pkt, 0, sizeof(pkt)); /* For security reasons */
@@ -120,7 +120,7 @@ static void autofs4_notify_daemon(struct
autofs_sb_info *sbi,

  pktsz = sizeof(*mp);

- mp->wait_queue_entry_token = wq->wait_queue_entry_token;
+ mp->wait_queue_token = wq->wait_queue_token;
  mp->len = wq->name.len;
  memcpy(mp->name, wq->name.name, wq->name.len);
  mp->name[wq->name.len] = '\0';
@@ -133,7 +133,7 @@ static void autofs4_notify_daemon(struct
autofs_sb_info *sbi,

  pktsz = sizeof(*ep);

- ep->wait_queue_entry_token = wq->wait_queue_entry_token;
+ ep->wait_queue_token = wq->wait_queue_token;
  ep->len = wq->name.len;
  memcpy(ep->name, wq->name.name, wq->name.len);
  ep->name[wq->name.len] = '\0';
@@ -153,7 +153,7 @@ static void autofs4_notify_daemon(struct
autofs_sb_info *sbi,

  pktsz = sizeof(*packet);

- packet->wait_queue_entry_token = wq->wait_queue_entry_token;
+ packet->wait_queue_token = wq->wait_queue_token;
  packet->len = wq->name.len;
  memcpy(packet->name, wq->name.name, wq->name.len);
  packet->name[wq->name.len] = '\0';
@@ -428,7 +428,7 @@ int autofs4_wait(struct autofs_sb_info *sbi,
  return -ENOMEM;
  }

- wq->wait_queue_entry_token = autofs4_next_wait_queue;
+ wq->wait_queue_token = autofs4_next_wait_queue;
  if (++autofs4_next_wait_queue == 0)
  autofs4_next_wait_queue = 1;
  wq->next = sbi->queues;
@@ -461,7 +461,7 @@ int autofs4_wait(struct autofs_sb_info *sbi,
  }

  pr_debug("new wait id = 0x%08lx, name = %.*s, nfy=%d\n",
- (unsigned long) wq->wait_queue_entry_token, wq->name.len,
+ (unsigned long) wq->wait_queue_token, wq->name.len,
  wq->name.name, notify);

  /*
@@ -471,7 +471,7 @@ int autofs4_wait(struct autofs_sb_info *sbi,
  } else {
  wq->wait_ctr++;
  pr_debug("existing wait id = 0x%08lx, name = %.*s, nfy=%d\n",
- (unsigned long) wq->wait_queue_entry_token, wq->name.len,
+ (unsigned long) wq->wait_queue_token, wq->name.len,
  wq->name.name, notify);
  mutex_unlock(&sbi->wq_mutex);
  kfree(qstr.name);
@@ -550,13 +550,13 @@ int autofs4_wait(struct autofs_sb_info *sbi,
 }


-int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t
wait_queue_entry_token, int status)
+int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t
wait_queue_token, int status)
 {
  struct autofs_wait_queue *wq, **wql;

  mutex_lock(&sbi->wq_mutex);
  for (wql = &sbi->queues; (wq = *wql) != NULL; wql = &wq->next) {
- if (wq->wait_queue_entry_token == wait_queue_entry_token)
+ if (wq->wait_queue_token == wait_queue_token)
  break;
  }

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.13.2

[toc] | [prev] | [next] | [standalone]

#1684388 — Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename

On 07/10/2017 07:01 AM, Gabriel C wrote:
> Hi,
> 
> 2017-07-10 6:40 GMT+02:00 Florian Fainelli <f.fainelli@gmail.com>:
>> 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 <f.fainelli@gmail.com>
>> ---
>>  include/uapi/linux/auto_fs.h  | 4 ++--
>>  include/uapi/linux/auto_fs4.h | 4 ++--
>>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> You need revert a lot more .. that won't even compile.

Right, sorry for the sloppy submission.

> 
> Looks like someone used some script to convert these :)
> 
> Something like this :
> 
> From 35d689b39286f94ded7609b5bed9ff0232958f9d Mon Sep 17 00:00:00 2001
> From: Gabriel Craciunescu <crazy@frugalware.org>
> Date: Mon, 10 Jul 2017 15:48:57 +0200
> Subject: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename
> 
> This reverts aufs parts of 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: Gabriel Craciunescu <nix.or.die@gmail.com>

Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>

Thanks!

> ---
>  Documentation/filesystems/autofs4.txt | 12 ++++++------
>  fs/autofs4/autofs_i.h                 |  2 +-
>  fs/autofs4/waitq.c                    | 18 +++++++++---------
>  include/uapi/linux/auto_fs.h          |  4 ++--
>  include/uapi/linux/auto_fs4.h         |  4 ++--
>  5 files changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/Documentation/filesystems/autofs4.txt
> b/Documentation/filesystems/autofs4.txt
> index 8444dc3d57e8..f10dd590f69f 100644
> --- a/Documentation/filesystems/autofs4.txt
> +++ b/Documentation/filesystems/autofs4.txt
> @@ -316,7 +316,7 @@ For version 5, the format of the message is:
>          struct autofs_v5_packet {
>                  int proto_version;                /* Protocol version */
>                  int type;                        /* Type of packet */
> -                autofs_wqt_t wait_queue_entry_token;
> +                autofs_wqt_t wait_queue_token;
>                  __u32 dev;
>                  __u64 ino;
>                  __u32 uid;
> @@ -341,12 +341,12 @@ The pipe will be set to "packet mode"
> (equivalent to passing
>  `O_DIRECT`) to _pipe2(2)_ so that a read from the pipe will return at
>  most one packet, and any unread portion of a packet will be discarded.
> 
> -The `wait_queue_entry_token` is a unique number which can identify a
> +The `wait_queue_token` is a unique number which can identify a
>  particular request to be acknowledged.  When a message is sent over
>  the pipe the affected dentry is marked as either "active" or
>  "expiring" and other accesses to it block until the message is
>  acknowledged using one of the ioctls below and the relevant
> -`wait_queue_entry_token`.
> +`wait_queue_token`.
> 
>  Communicating with autofs: root directory ioctls
>  ------------------------------------------------
> @@ -358,7 +358,7 @@ capability, or must be the automount daemon.
>  The available ioctl commands are:
> 
>  - **AUTOFS_IOC_READY**: a notification has been handled.  The argument
> -    to the ioctl command is the "wait_queue_entry_token" number
> +    to the ioctl command is the "wait_queue_token" number
>      corresponding to the notification being acknowledged.
>  - **AUTOFS_IOC_FAIL**: similar to above, but indicates failure with
>      the error code `ENOENT`.
> @@ -382,14 +382,14 @@ The available ioctl commands are:
>          struct autofs_packet_expire_multi {
>                  int proto_version;              /* Protocol version */
>                  int type;                       /* Type of packet */
> -                autofs_wqt_t wait_queue_entry_token;
> +                autofs_wqt_t wait_queue_token;
>                  int len;
>                  char name[NAME_MAX+1];
>          };
> 
>       is required.  This is filled in with the name of something
>       that can be unmounted or removed.  If nothing can be expired,
> -     `errno` is set to `EAGAIN`.  Even though a `wait_queue_entry_token`
> +     `errno` is set to `EAGAIN`.  Even though a `wait_queue_token`
>       is present in the structure, no "wait queue" is established
>       and no acknowledgment is needed.
>  - **AUTOFS_IOC_EXPIRE_MULTI**:  This is similar to
> diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
> index 974f5346458a..beef981aa54f 100644
> --- a/fs/autofs4/autofs_i.h
> +++ b/fs/autofs4/autofs_i.h
> @@ -83,7 +83,7 @@ struct autofs_info {
>  struct autofs_wait_queue {
>   wait_queue_head_t queue;
>   struct autofs_wait_queue *next;
> - autofs_wqt_t wait_queue_entry_token;
> + autofs_wqt_t wait_queue_token;
>   /* We use the following to see what we are waiting for */
>   struct qstr name;
>   u32 dev;
> diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
> index 7071895b0678..24a58bf9ca72 100644
> --- a/fs/autofs4/waitq.c
> +++ b/fs/autofs4/waitq.c
> @@ -104,7 +104,7 @@ static void autofs4_notify_daemon(struct
> autofs_sb_info *sbi,
>   size_t pktsz;
> 
>   pr_debug("wait id = 0x%08lx, name = %.*s, type=%d\n",
> - (unsigned long) wq->wait_queue_entry_token,
> + (unsigned long) wq->wait_queue_token,
>   wq->name.len, wq->name.name, type);
> 
>   memset(&pkt, 0, sizeof(pkt)); /* For security reasons */
> @@ -120,7 +120,7 @@ static void autofs4_notify_daemon(struct
> autofs_sb_info *sbi,
> 
>   pktsz = sizeof(*mp);
> 
> - mp->wait_queue_entry_token = wq->wait_queue_entry_token;
> + mp->wait_queue_token = wq->wait_queue_token;
>   mp->len = wq->name.len;
>   memcpy(mp->name, wq->name.name, wq->name.len);
>   mp->name[wq->name.len] = '\0';
> @@ -133,7 +133,7 @@ static void autofs4_notify_daemon(struct
> autofs_sb_info *sbi,
> 
>   pktsz = sizeof(*ep);
> 
> - ep->wait_queue_entry_token = wq->wait_queue_entry_token;
> + ep->wait_queue_token = wq->wait_queue_token;
>   ep->len = wq->name.len;
>   memcpy(ep->name, wq->name.name, wq->name.len);
>   ep->name[wq->name.len] = '\0';
> @@ -153,7 +153,7 @@ static void autofs4_notify_daemon(struct
> autofs_sb_info *sbi,
> 
>   pktsz = sizeof(*packet);
> 
> - packet->wait_queue_entry_token = wq->wait_queue_entry_token;
> + packet->wait_queue_token = wq->wait_queue_token;
>   packet->len = wq->name.len;
>   memcpy(packet->name, wq->name.name, wq->name.len);
>   packet->name[wq->name.len] = '\0';
> @@ -428,7 +428,7 @@ int autofs4_wait(struct autofs_sb_info *sbi,
>   return -ENOMEM;
>   }
> 
> - wq->wait_queue_entry_token = autofs4_next_wait_queue;
> + wq->wait_queue_token = autofs4_next_wait_queue;
>   if (++autofs4_next_wait_queue == 0)
>   autofs4_next_wait_queue = 1;
>   wq->next = sbi->queues;
> @@ -461,7 +461,7 @@ int autofs4_wait(struct autofs_sb_info *sbi,
>   }
> 
>   pr_debug("new wait id = 0x%08lx, name = %.*s, nfy=%d\n",
> - (unsigned long) wq->wait_queue_entry_token, wq->name.len,
> + (unsigned long) wq->wait_queue_token, wq->name.len,
>   wq->name.name, notify);
> 
>   /*
> @@ -471,7 +471,7 @@ int autofs4_wait(struct autofs_sb_info *sbi,
>   } else {
>   wq->wait_ctr++;
>   pr_debug("existing wait id = 0x%08lx, name = %.*s, nfy=%d\n",
> - (unsigned long) wq->wait_queue_entry_token, wq->name.len,
> + (unsigned long) wq->wait_queue_token, wq->name.len,
>   wq->name.name, notify);
>   mutex_unlock(&sbi->wq_mutex);
>   kfree(qstr.name);
> @@ -550,13 +550,13 @@ int autofs4_wait(struct autofs_sb_info *sbi,
>  }
> 
> 
> -int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t
> wait_queue_entry_token, int status)
> +int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t
> wait_queue_token, int status)
>  {
>   struct autofs_wait_queue *wq, **wql;
> 
>   mutex_lock(&sbi->wq_mutex);
>   for (wql = &sbi->queues; (wq = *wql) != NULL; wql = &wq->next) {
> - if (wq->wait_queue_entry_token == wait_queue_entry_token)
> + if (wq->wait_queue_token == wait_queue_token)
>   break;
>   }
> 
> 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;
> 


-- 
Florian

[toc] | [prev] | [next] | [standalone]

#1684584 — Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename

On Mon, Jul 10, 2017 at 7:01 AM, Gabriel C <nix.or.die@gmail.com> wrote:
>
> You need revert a lot more .. that won't even compile.
>
> Looks like someone used some script to convert these :)
>
> Something like this :

Gaah, I just committed my own scripted fixup:

        git grep -lw wait_queue_entry_token |
            xargs sed -i 's/wait_queue_entry_token/wait_queue_token/g'

which seems to match your patch (and that I visually inspected doesn't
change anything but wait_queue_entry_token - there were no odd even
bigger names ;)

             Linus

[toc] | [prev] | [next] | [standalone]

#1684684 — Re: [PATCH] autofs: Revert wait_queue_t => wait_queue_entry_t rename

On 07/10/2017 11:47 AM, Linus Torvalds wrote:
> On Mon, Jul 10, 2017 at 7:01 AM, Gabriel C <nix.or.die@gmail.com> wrote:
>>
>> You need revert a lot more .. that won't even compile.
>>
>> Looks like someone used some script to convert these :)
>>
>> Something like this :
> 
> Gaah, I just committed my own scripted fixup:
> 
>         git grep -lw wait_queue_entry_token |
>             xargs sed -i 's/wait_queue_entry_token/wait_queue_token/g'
> 
> which seems to match your patch (and that I visually inspected doesn't
> change anything but wait_queue_entry_token - there were no odd even
> bigger names ;)

Looks good, thanks for the quick fix.
-- 
Florian

[toc] | [prev] | [next] | [standalone]

#1684057

* Florian Fainelli <f.fainelli@gmail.com> wrote:

> On 07/03/2017 01:39 AM, Ingo Molnar wrote:
> > Linus,
> > 
> > Please pull the latest sched-core-for-linus git tree from:
> > 
> >    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-core-for-linus
> > 
> >    # HEAD: 72298e5c92c50edd8cb7cfda4519483ce65fa166 sched/cputime: Refactor the cputime_adjust() code
> > 
> > The main changes in this cycle were:
> > 
> >  - Add the SYSTEM_SCHEDULING bootup state to move various scheduler debug checks 
> >    earlier into the bootup. This turns silent and sporadically deadly bugs into
> >    nice, deterministic splats. Fix some of the splats that triggered.
> >    (Thomas Gleixner)
> > 
> >  - A round of restructuring and refactoring of the load-balancing and topology 
> >    code (Peter Zijlstra)
> > 
> >  - Another round of consolidating ~20 of incremental scheduler code history: this 
> >    time in terms of wait-queue nomenclature. (I didn't get much feedback on these 
> >    renaming patches, and we can still easily change any names I might have 
> >    misplaced, so if anyone hates a new name, please holler and I'll fix it.)
> >    (Ingo Molnar)
> 
> This commit ac6424b981bce1c4bc55675c6ce11bfe1bbfa64f ("sched/wait:
> Rename wait_queue_t => wait_queue_entry_t") ends up renaming the
> autofs_packet_missing, autofs_packet_expire_multi and autofs_v5_packet
> member previously named wait_queue_entry to wait_queue_entry_token. Was
> it intentional to force an user space build breakage when building
> against v4.13-rc headers for autofs headers?

Nope - mind sending a tested patch?

Thanks,

	Ingo

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web