From: Ian Kent <raven@themaw.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Tomohiro Kusumi <kusumi.tomohiro@gmail.com>,
autofs mailing list <autofs@vger.kernel.org>,
Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH 03/18] autofs: Test autofs versions first on sb initialization
Date: Fri, 12 Aug 2016 10:47:44 +0800 [thread overview]
Message-ID: <20160812024744.12352.43075.stgit@pluto.themaw.net> (raw)
In-Reply-To: <20160812024734.12352.17122.stgit@pluto.themaw.net>
From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
This patch does what the below comment says.
It could be and it's considered better to do this first
before various functions get called during initialization.
/* Couldn't this be tested earlier? */
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Signed-off-by: Ian Kent <raven@themaw.net>
---
fs/autofs4/inode.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 61b2105..8357544 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -274,6 +274,23 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
goto fail_dput;
}
+ /* Test versions first */
+ if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION ||
+ sbi->min_proto > AUTOFS_MAX_PROTO_VERSION) {
+ pr_err("kernel does not match daemon version "
+ "daemon (%d, %d) kernel (%d, %d)\n",
+ sbi->min_proto, sbi->max_proto,
+ AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION);
+ goto fail_dput;
+ }
+
+ /* Establish highest kernel protocol version */
+ if (sbi->max_proto > AUTOFS_MAX_PROTO_VERSION)
+ sbi->version = AUTOFS_MAX_PROTO_VERSION;
+ else
+ sbi->version = sbi->max_proto;
+ sbi->sub_version = AUTOFS_PROTO_SUBVERSION;
+
if (pgrp_set) {
sbi->oz_pgrp = find_get_pid(pgrp);
if (!sbi->oz_pgrp) {
@@ -291,23 +308,6 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
root_inode->i_fop = &autofs4_root_operations;
root_inode->i_op = &autofs4_dir_inode_operations;
- /* Couldn't this be tested earlier? */
- if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION ||
- sbi->min_proto > AUTOFS_MAX_PROTO_VERSION) {
- pr_err("kernel does not match daemon version "
- "daemon (%d, %d) kernel (%d, %d)\n",
- sbi->min_proto, sbi->max_proto,
- AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION);
- goto fail_dput;
- }
-
- /* Establish highest kernel protocol version */
- if (sbi->max_proto > AUTOFS_MAX_PROTO_VERSION)
- sbi->version = AUTOFS_MAX_PROTO_VERSION;
- else
- sbi->version = sbi->max_proto;
- sbi->sub_version = AUTOFS_PROTO_SUBVERSION;
-
pr_debug("pipe fd = %d, pgrp = %u\n", pipefd, pid_nr(sbi->oz_pgrp));
pipe = fget(pipefd);
next prev parent reply other threads:[~2016-08-12 2:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-12 2:47 [PATCH 01/18] autofs: Fix typos in Documentation/filesystems/autofs4.txt Ian Kent
2016-08-12 2:47 ` [PATCH 02/18] autofs: Drop unnecessary extern in autofs_i.h Ian Kent
2016-08-12 2:47 ` Ian Kent [this message]
2016-08-12 2:47 ` [PATCH 04/18] autofs - fix autofs4_fill_super() error exit handling Ian Kent
2016-08-12 2:47 ` [PATCH 05/18] autofs: Add WARN_ON(1) for non dir/link inode case Ian Kent
2016-08-12 2:48 ` [PATCH 06/18] autofs - remove ino free in autofs4_dir_symlink() Ian Kent
2016-08-12 2:48 ` [PATCH 07/18] autofs: Use autofs4_free_ino() to kfree dentry data Ian Kent
2016-08-12 2:48 ` [PATCH 08/18] autofs: Remove obsolete sb fields Ian Kent
2016-08-12 2:48 ` [PATCH 09/18] autofs: Don't fail to free_dev_ioctl(param) Ian Kent
2016-08-12 2:48 ` [PATCH 10/18] autofs: Remove AUTOFS_DEVID_LEN Ian Kent
2016-08-12 2:48 ` [PATCH 11/18] autofs: Fix Documentation regarding devid on ioctl Ian Kent
2016-08-12 2:48 ` [PATCH 12/18] autofs: Update struct autofs_dev_ioctl in Documentation Ian Kent
2016-08-12 2:48 ` [PATCH 13/18] autofs: Fix pr_debug() message Ian Kent
2016-08-12 2:48 ` [PATCH 14/18] autofs - fix dev ioctl number range check Ian Kent
2016-08-12 2:48 ` [PATCH 15/18] autofs: Add autofs_dev_ioctl_version() for AUTOFS_DEV_IOCTL_VERSION_CMD Ian Kent
2016-08-12 2:48 ` [PATCH 16/18] autofs: Fix print format for ioctl warning message Ian Kent
2016-08-12 2:48 ` [PATCH 17/18] autofs: Move inclusion of linux/limits.h to uapi Ian Kent
2016-08-12 2:49 ` [PATCH 18/18] autofs4 - move linux/auto_dev-ioctl.h to uapi/linux Ian Kent
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=20160812024744.12352.43075.stgit@pluto.themaw.net \
--to=raven@themaw.net \
--cc=akpm@linux-foundation.org \
--cc=autofs@vger.kernel.org \
--cc=kusumi.tomohiro@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).