From: bfields@fieldses.org (J. Bruce Fields)
To: Trond Myklebust <trondmy@gmail.com>
Cc: SteveD@redhat.com, linux-nfs@vger.kernel.org
Subject: Re: [PATCH v3 08/11] Add support for the "[exports] rootdir" nfs.conf option to rpc.mountd
Date: Fri, 31 May 2019 12:02:24 -0400 [thread overview]
Message-ID: <20190531160224.GD1251@fieldses.org> (raw)
In-Reply-To: <20190528203122.11401-9-trond.myklebust@hammerspace.com>
On Tue, May 28, 2019 at 04:31:19PM -0400, Trond Myklebust wrote:
> @@ -373,21 +390,22 @@ static char *next_mnt(void **v, char *p)
> FILE *f;
> struct mntent *me;
> size_t l = strlen(p);
> + char *mnt_dir = NULL;
> +
> if (*v == NULL) {
> f = setmntent("/etc/mtab", "r");
> *v = f;
> } else
> f = *v;
> - while ((me = getmntent(f)) != NULL && l > 1 &&
> - (strncmp(me->mnt_dir, p, l) != 0 ||
> - me->mnt_dir[l] != '/'))
> - ;
> - if (me == NULL) {
> - endmntent(f);
> - *v = NULL;
> - return NULL;
> + while ((me = getmntent(f)) != NULL && l > 1) {
> + mnt_dir = nfsd_path_strip_root(me->mnt_dir);
> +
> + if (strncmp(mnt_dir, p, l) == 0 && mnt_dir[l] != '/')
> + return mnt_dir;
That should be "mnt_dir[l] == '/'", right?
--b.
> }
> - return me->mnt_dir;
> + endmntent(f);
> + *v = NULL;
> + return NULL;
> }
>
> /* same_path() check is two paths refer to the same directory.
next prev parent reply other threads:[~2019-05-31 16:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-28 20:31 [PATCH v3 00/11] Add the "[exports] rootdir" option to nfs.conf Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 01/11] mountd: Ensure we don't share cache file descriptors among processes Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 02/11] Add a simple workqueue mechanism Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 03/11] Allow callers to check mountpoint status using a custom lstat function Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 04/11] Add utilities for resolving nfsd paths and stat()ing them Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 05/11] Use xstat() with no synchronisation if available Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 06/11] Add helpers to read/write to a file through the chrooted thread Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 07/11] Add a helper to return the real path given an export entry Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 08/11] Add support for the "[exports] rootdir" nfs.conf option to rpc.mountd Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 09/11] Add support for the "[exports] rootdir" nfs.conf option to exportfs Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 10/11] Add a helper for resolving symlinked nfsd paths via realpath() Trond Myklebust
2019-05-28 20:31 ` [PATCH v3 11/11] Fix up symlinked mount path resolution when "[exports] rootdir" is set Trond Myklebust
2019-05-31 16:02 ` J. Bruce Fields [this message]
2019-06-03 14:18 ` [PATCH v3 08/11] Add support for the "[exports] rootdir" nfs.conf option to rpc.mountd Steve Dickson
2019-06-03 16:30 ` Trond Myklebust
2019-05-29 14:38 ` [PATCH v3 07/11] Add a helper to return the real path given an export entry Steve Dickson
2019-05-29 14:55 ` Trond Myklebust
2019-05-29 16:03 ` Steve Dickson
2019-05-29 16:12 ` Trond Myklebust
2019-05-29 17:17 ` Steve Dickson
2019-05-31 15:52 ` [PATCH v3 04/11] Add utilities for resolving nfsd paths and stat()ing them J. Bruce Fields
2019-06-03 14:21 ` Steve Dickson
2019-06-03 16:32 ` Trond Myklebust
2019-06-10 13:53 ` [PATCH v3 00/11] Add the "[exports] rootdir" option to nfs.conf Steve Dickson
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=20190531160224.GD1251@fieldses.org \
--to=bfields@fieldses.org \
--cc=SteveD@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trondmy@gmail.com \
/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).