From: michael@ozlabs.org (mpe@ellerman.id.au)
To: Al Viro <viro@ZenIV.linux.org.uk>,
"J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kinglong Mee <kinglongmee@gmail.com>
Subject: linux-next: manual merge of the vfs tree with the tree
Date: Fri, 5 Jun 2015 15:46:07 +1000 (AEST) [thread overview]
Message-ID: <20150605054607.C628E1401DE@ozlabs.org> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/namei.c between
commit 890458a43dbd ("path: New helpers path_get_pin/path_put_unpin for path
pin") from the nfsd tree and commit 894bc8c4662b ("namei: remove restrictions
on nesting depth") from the vfs tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
cheers
diff --cc fs/namei.c
index d41a29efca67,2dad0eaf91d3..000000000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -492,32 -492,7 +492,33 @@@ void path_put(const struct path *path
}
EXPORT_SYMBOL(path_put);
+/**
+ * path_get_pin - get a reference to a path's dentry
+ * and pin to path's vfsmnt
+ * @path: path to get the reference to
+ * @p: the fs_pin pin to vfsmnt
+ */
+void path_get_pin(struct path *path, struct fs_pin *p)
+{
+ dget(path->dentry);
+ pin_insert_group(p, path->mnt, NULL);
+}
+EXPORT_SYMBOL(path_get_pin);
+
+/**
+ * path_put_unpin - put a reference to a path's dentry
+ * and remove pin to path's vfsmnt
+ * @path: path to put the reference to
+ * @p: the fs_pin removed from vfsmnt
+ */
+void path_put_unpin(struct path *path, struct fs_pin *p)
+{
+ dput(path->dentry);
+ pin_remove(p);
+}
+EXPORT_SYMBOL(path_put_unpin);
+
+ #define EMBEDDED_LEVELS 2
struct nameidata {
struct path path;
struct qstr last;
next reply other threads:[~2015-06-05 5:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-05 5:46 mpe@ellerman.id.au [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-29 3:25 linux-next: manual merge of the vfs tree with the tree Stephen Rothwell
2012-09-24 1:45 Stephen Rothwell
2009-06-09 1:08 Stephen Rothwell
2009-06-09 6:58 ` Miklos Szeredi
2009-06-09 7:27 ` Stephen Rothwell
2009-05-22 1:23 Stephen Rothwell
2009-05-24 22:03 ` Frederic Weisbecker
2009-05-24 22:07 ` Christoph Hellwig
2009-05-25 17:10 ` Frederic Weisbecker
2009-05-25 6:50 ` Stephen Rothwell
2009-05-13 2:20 Stephen Rothwell
2009-05-08 4:44 Stephen Rothwell
2009-05-08 13:40 ` Miklos Szeredi
2009-05-08 17:50 ` Al Viro
2009-05-09 16:58 ` Miklos Szeredi
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=20150605054607.C628E1401DE@ozlabs.org \
--to=michael@ozlabs.org \
--cc=bfields@fieldses.org \
--cc=kinglongmee@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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).