From: Richard Weinberger <richard@nod.at>
To: linux-mtd@lists.infradead.org
Cc: david@sigma-star.at, dedekind1@gmail.com,
adrian.hunter@intel.com, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, adilger.kernel@dilger.ca,
akpm@linux-foundation.org, linux-ext4@vger.kernel.org,
bfields@redhat.com, marcus.folkesson@gmail.com,
hyc.lee@gmail.com, rockdotlee@gmail.com, leon.pollak@gmail.com,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 6/6] ubifs: Wire up NFS support
Date: Sun, 21 May 2017 22:20:51 +0200 [thread overview]
Message-ID: <1495398051-4604-7-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1495398051-4604-1-git-send-email-richard@nod.at>
Since we have 64bit readdir cookies and export operations
we can finally enable NFS export support for UBIFS.
Signed-off-by: Richard Weinberger <richard@nod.at>
Reviewed-by: J. Bruce Fields <bfields@redhat.com>
---
fs/ubifs/dir.c | 10 ++--------
fs/ubifs/super.c | 3 +++
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index a6eadb52a1a8..13b0db37be41 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -298,12 +298,8 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,
done:
kfree(dent);
fscrypt_free_filename(&nm);
- /*
- * Note, d_splice_alias() would be required instead if we supported
- * NFS.
- */
- d_add(dentry, inode);
- return NULL;
+
+ return d_splice_alias(inode, dentry);
out_inode:
iput(inode);
@@ -525,8 +521,6 @@ static unsigned int vfs_dent_type(uint8_t type)
* properly by means of saving full directory entry name in the private field
* of the file description object.
*
- * This means that UBIFS cannot support NFS which requires full
- * 'seekdir()'/'telldir()' support.
*/
static int ubifs_readdir(struct file *file, struct dir_context *ctx)
{
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 4788420162b8..00ddde36e546 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2091,6 +2091,9 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
goto out_unlock;
}
+ if (c->parent_pointer && c->double_hash)
+ sb->s_export_op = &ubifs_export_ops;
+
/* Read the root inode */
root = ubifs_iget(sb, UBIFS_ROOT_INO);
if (IS_ERR(root)) {
--
2.12.0
next prev parent reply other threads:[~2017-05-21 20:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-21 20:20 [PATCH 0/6] UBIFS NFS export support v2 Richard Weinberger
2017-05-21 20:20 ` [PATCH 1/6] ext4: Move is_32bit_api() to generic code Richard Weinberger
2017-05-23 8:36 ` Christoph Hellwig
2017-05-21 20:20 ` [PATCH 2/6] ubifs: Provide a custom llseek for directories Richard Weinberger
2017-05-21 20:20 ` [PATCH 3/6] ubifs: Use 64bit readdir cookies Richard Weinberger
2017-05-21 20:20 ` [PATCH 4/6] ubifs: Maintain a parent pointer Richard Weinberger
2017-05-22 4:30 ` Hyunchul Lee
2017-05-22 8:45 ` Richard Weinberger
2017-05-22 23:50 ` Hyunchul Lee
2017-05-23 7:16 ` Richard Weinberger
2017-05-23 8:37 ` Christoph Hellwig
2017-05-23 8:42 ` Richard Weinberger
2017-05-21 20:20 ` [PATCH 5/6] ubifs: Implement export_operations Richard Weinberger
2017-05-23 8:39 ` Christoph Hellwig
2017-05-23 8:41 ` Richard Weinberger
2017-05-23 8:48 ` Christoph Hellwig
2017-05-23 8:50 ` Richard Weinberger
2017-05-21 20:20 ` Richard Weinberger [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-12-01 22:02 [PATCH 0/6] UBIFS NFS export support Richard Weinberger
2016-12-01 22:02 ` [PATCH 6/6] ubifs: Wire up NFS support Richard Weinberger
2016-12-29 2:56 ` J. Bruce Fields
2016-12-29 8:48 ` Richard Weinberger
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=1495398051-4604-7-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=adilger.kernel@dilger.ca \
--cc=adrian.hunter@intel.com \
--cc=akpm@linux-foundation.org \
--cc=bfields@redhat.com \
--cc=david@sigma-star.at \
--cc=dedekind1@gmail.com \
--cc=hyc.lee@gmail.com \
--cc=leon.pollak@gmail.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marcus.folkesson@gmail.com \
--cc=rockdotlee@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).