diff options
| author | Fabian Frederick <fabf@skynet.be> | 2017-02-28 01:27:49 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 05:43:45 +0300 |
| commit | ed4433d72394131244276d6e7590a7b24a2c9f64 (patch) | |
| tree | 6f49befa6f76a3b1e4d64a1d8c2cdb5ccaf8ba71 /fs/affs | |
| parent | d5de9fd594eba1b94f0ef701c044f567f605bc9e (diff) | |
| download | linux-ed4433d72394131244276d6e7590a7b24a2c9f64.tar.xz | |
fs/affs: make affs exportable
Add standard functions making AFFS work with NFS.
Functions based on ext4 implementation. Tested on loop device.
Link: http://lkml.kernel.org/r/20170109191208.6085-4-fabf@skynet.be
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/affs.h | 1 | ||||
| -rw-r--r-- | fs/affs/namei.c | 40 | ||||
| -rw-r--r-- | fs/affs/super.c | 1 |
3 files changed, 42 insertions, 0 deletions
diff --git a/fs/affs/affs.h b/fs/affs/affs.h index efe683947df9..1b5542818b2c 100644 --- a/fs/affs/affs.h +++ b/fs/affs/affs.h @@ -162,6 +162,7 @@ extern void affs_free_bitmap(struct super_block *sb); /* namei.c */ +extern const struct export_operations affs_export_ops; extern int affs_hash_name(struct super_block *sb, const u8 *name, unsigned int len); extern struct dentry *affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int); extern int affs_unlink(struct inode *dir, struct dentry *dentry); diff --git a/fs/affs/namei.c b/fs/affs/namei.c index 29186d29a3b6..04c3156ff411 100644 --- a/fs/affs/namei.c +++ b/fs/affs/namei.c @@ -9,6 +9,7 @@ */ #include "affs.h" +#include <linux/exportfs.h> typedef int (*toupper_t)(int); @@ -465,3 +466,42 @@ done: affs_brelse(bh); return retval; } + +static struct inode *affs_nfs_get_inode(struct super_block *sb, u64 ino, + u32 generation) +{ + struct inode *inode; + + if (!affs_validblock(sb, ino)) + return ERR_PTR(-ESTALE); + + inode = affs_iget(sb, ino); + if (IS_ERR(inode)) + return ERR_CAST(inode); + + if (generation && inode->i_generation != generation) { + iput(inode); + return ERR_PTR(-ESTALE); + } + + return inode; +} + +static struct dentry *affs_fh_to_dentry(struct super_block *sb, struct fid *fid, + int fh_len, int fh_type) +{ + return generic_fh_to_dentry(sb, fid, fh_len, fh_type, + affs_nfs_get_inode); +} + +static struct dentry *affs_fh_to_parent(struct super_block *sb, struct fid *fid, + int fh_len, int fh_type) +{ + return generic_fh_to_parent(sb, fid, fh_len, fh_type, + affs_nfs_get_inode); +} + +const struct export_operations affs_export_ops = { + .fh_to_dentry = affs_fh_to_dentry, + .fh_to_parent = affs_fh_to_parent, +}; diff --git a/fs/affs/super.c b/fs/affs/super.c index d6384863192c..98bd95291694 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -507,6 +507,7 @@ got_root: return -ENOMEM; } + sb->s_export_op = &affs_export_ops; pr_debug("s_flags=%lX\n", sb->s_flags); return 0; } |