ext4: new export ops
PATCH 28/41 ext4: new export ops
From: Christoph Hellwig <[email protected]>
Trivial switch over to the new generic helpers.
Signed-off-by Christoph Hellwig <[email protected]>
Cc Neil Brown <[email protected]>
Cc "J. Bruce Fields" <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/ext4/super.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-)
fs/ext4/super.c renamed from fs/ext4/super.c~ext4-new-export-ops +20 -15
@@ -686,13 +686,10 @@ static int ext4_show_options(struct seq_ } -static struct dentry *ext4_get_dentry (struct super_block *sb,void *vobjp) +static struct inode *ext4_nfs_get_inode (struct super_block *sb, +u64 ino,u32 generation) { -__u32 *objp = vobjp; -unsigned long ino = objp[0 ]; -__u32 generation = objp[1 ];struct inode *inode; -struct dentry *result;if (ino <EXT4_FIRST_INO (sb) && ino !=EXT4_ROOT_INO )return ERR_PTR (-ESTALE );
@@ -715,15 +712,22 @@ static struct dentry *ext4_get_dentry(stiput (inode);return ERR_PTR (-ESTALE ); } -/* now to find a dentry. -* If possible, get a well-connected one -*/ - result =d_alloc_anon (inode); -if (!result) { -iput (inode); -return ERR_PTR (-ENOMEM ); - } -return result; + +return inode; +} + +static struct dentry *ext4_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, + ext4_nfs_get_inode); +} + +static struct dentry *ext4_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, + ext4_nfs_get_inode); }#ifdef CONFIG_QUOTA
@@ -793,8 +797,9 @@ static const struct super_operations ext };static struct export_operations ext4_export_ops = { + .fh_to_dentry = ext4_fh_to_dentry, + .fh_to_parent = ext4_fh_to_parent, .get_parent = ext4_get_parent, - .get_dentry = ext4_get_dentry, };enum {
_