[PATCH 6/6] ubifs: Wire up NFS support

[Richard Weinberger]

Since we have 64bit readdir cookies and export operations
we can finally enable NFS export support for UBIFS.

Signed-off-by: Richard Weinberger 
Reviewed-by: J. Bruce Fields 
---
 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

Re: [PATCH 6/6] ubifs: Wire up NFS support

[Richard Weinberger]

Bruce,

On 29.12.2016 03:56, J. Bruce Fields wrote:
>> - * Note, d_splice_alias() would be required instead if we supported
>> - * NFS.
>> - */
>> -d_add(dentry, inode);
>> +
>> +d_splice_alias(inode, dentry);
>>  return NULL;
> 
> I'm pretty sure that should be 
> 
>   return d_splice_alias(inode, dentry);

You are right.
/me assumed d_splice_alias() is consistent with d_add(). :-(

Thanks,
//richard

Re: [PATCH 6/6] ubifs: Wire up NFS support

[J. Bruce Fields]

On Thu, Dec 01, 2016 at 11:02:21PM +0100, Richard Weinberger wrote:
> Since we have 64bit readdir cookies and export operations
> we can finally enable NFS export support for UBIFS.
> 
> Signed-off-by: Richard Weinberger 
> ---
>  fs/ubifs/dir.c   | 9 ++---
>  fs/ubifs/super.c | 3 +++
>  2 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
> index 5485d836af21..13d13afd2976 100644
> --- a/fs/ubifs/dir.c
> +++ b/fs/ubifs/dir.c
> @@ -289,11 +289,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);
> +
> + d_splice_alias(inode, dentry);
>   return NULL;

I'm pretty sure that should be 

return d_splice_alias(inode, dentry);

--b.

>  
>  out_dent:
> @@ -524,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 be5b697d8214..4cb7f641f35c 100644
> --- a/fs/ubifs/super.c
> +++ b/fs/ubifs/super.c
> @@ -2092,6 +2092,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.7.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 6/6] ubifs: Wire up NFS support

[Richard Weinberger]

Since we have 64bit readdir cookies and export operations
we can finally enable NFS export support for UBIFS.

Signed-off-by: Richard Weinberger 
---
 fs/ubifs/dir.c   | 9 ++---
 fs/ubifs/super.c | 3 +++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 5485d836af21..13d13afd2976 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -289,11 +289,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);
+
+   d_splice_alias(inode, dentry);
return NULL;
 
 out_dent:
@@ -524,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 be5b697d8214..4cb7f641f35c 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2092,6 +2092,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.7.3