From: Kieran Bingham <kieran.bingham@ideasonboard.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Jan Kiszka <jan.kiszka@siemens.com>,
Jackie Liu <liuyun01@kylinos.cn>,
Kieran Bingham <kbingham@kernel.org>
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>,
Dan Robertson <danlrobertson89@gmail.com>,
ndesaulniers@google.com, linux-kernel@vger.kernel.org,
stable@vger.kernel.org,
Kieran Bingham <kieran.bingham@ideasonboard.com>
Subject: [PATCH v3] scripts/gdb: replace flags (MS_xyz -> SB_xyz)
Date: Tue, 5 Mar 2019 10:30:14 +0000 [thread overview]
Message-ID: <20190305103014.25847-1-kieran.bingham@ideasonboard.com> (raw)
From: Jackie Liu <liuyun01@kylinos.cn>
Since commit 1751e8a6cb93 ("Rename superblock flags (MS_xyz -> SB_xyz)"),
scripts/gdb should be updated to replace MS_xyz with SB_xyz.
This change didn't directly affect the running operation of scripts/gdb until
commit e262e32d6bde "vfs: Suppress MS_* flag defs within the kernel unless
explicitly enabled" removed the definitions used by constants.py.
Update constants.py.in to utilise the new internal flags, matching the
implementation at fs/proc_namespace.c::show_sb_opts.
Cc: <stable@vger.kernel.org>
Fixes: e262e32d6bde "vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled"
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
[Kieran: Add fixes tag, reword commit message]
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
scripts/gdb/linux/constants.py.in | 12 ++++++------
scripts/gdb/linux/proc.py | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
index 7aad82406422..d3319a80788a 100644
--- a/scripts/gdb/linux/constants.py.in
+++ b/scripts/gdb/linux/constants.py.in
@@ -37,12 +37,12 @@
import gdb
/* linux/fs.h */
-LX_VALUE(MS_RDONLY)
-LX_VALUE(MS_SYNCHRONOUS)
-LX_VALUE(MS_MANDLOCK)
-LX_VALUE(MS_DIRSYNC)
-LX_VALUE(MS_NOATIME)
-LX_VALUE(MS_NODIRATIME)
+LX_VALUE(SB_RDONLY)
+LX_VALUE(SB_SYNCHRONOUS)
+LX_VALUE(SB_MANDLOCK)
+LX_VALUE(SB_DIRSYNC)
+LX_VALUE(SB_NOATIME)
+LX_VALUE(SB_NODIRATIME)
/* linux/mount.h */
LX_VALUE(MNT_NOSUID)
diff --git a/scripts/gdb/linux/proc.py b/scripts/gdb/linux/proc.py
index 0aebd7565b03..2f01a958eb22 100644
--- a/scripts/gdb/linux/proc.py
+++ b/scripts/gdb/linux/proc.py
@@ -114,11 +114,11 @@ def info_opts(lst, opt):
return opts
-FS_INFO = {constants.LX_MS_SYNCHRONOUS: ",sync",
- constants.LX_MS_MANDLOCK: ",mand",
- constants.LX_MS_DIRSYNC: ",dirsync",
- constants.LX_MS_NOATIME: ",noatime",
- constants.LX_MS_NODIRATIME: ",nodiratime"}
+FS_INFO = {constants.LX_SB_SYNCHRONOUS: ",sync",
+ constants.LX_SB_MANDLOCK: ",mand",
+ constants.LX_SB_DIRSYNC: ",dirsync",
+ constants.LX_SB_NOATIME: ",noatime",
+ constants.LX_SB_NODIRATIME: ",nodiratime"}
MNT_INFO = {constants.LX_MNT_NOSUID: ",nosuid",
constants.LX_MNT_NODEV: ",nodev",
@@ -184,7 +184,7 @@ values of that process namespace"""
fstype = superblock['s_type']['name'].string()
s_flags = int(superblock['s_flags'])
m_flags = int(vfs['mnt']['mnt_flags'])
- rd = "ro" if (s_flags & constants.LX_MS_RDONLY) else "rw"
+ rd = "ro" if (s_flags & constants.LX_SB_RDONLY) else "rw"
gdb.write(
"{} {} {} {}{}{} 0 0\n"
--
2.19.1
next reply other threads:[~2019-03-05 10:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-05 10:30 Kieran Bingham [this message]
2019-03-05 21:47 ` Nick Desaulniers
2019-03-08 12:36 ` Greg KH
2019-03-08 20:56 ` Nick Desaulniers
2019-03-12 12:50 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190305103014.25847-1-kieran.bingham@ideasonboard.com \
--to=kieran.bingham@ideasonboard.com \
--cc=akpm@linux-foundation.org \
--cc=danlrobertson89@gmail.com \
--cc=felipe.balbi@linux.intel.com \
--cc=jan.kiszka@siemens.com \
--cc=kbingham@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liuyun01@kylinos.cn \
--cc=ndesaulniers@google.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®