ext3: new export ops
Trivial switch over to the new generic helpers. Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: Neil Brown <neilb@suse.de> Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
2e4c68e303
commit
74af0baad4
|
@ -631,13 +631,10 @@ static int ext3_show_options(struct seq_file *seq, struct vfsmount *vfs)
|
|||
}
|
||||
|
||||
|
||||
static struct dentry *ext3_get_dentry(struct super_block *sb, void *vobjp)
|
||||
static struct inode *ext3_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 < EXT3_FIRST_INO(sb) && ino != EXT3_ROOT_INO)
|
||||
return ERR_PTR(-ESTALE);
|
||||
|
@ -660,15 +657,22 @@ static struct dentry *ext3_get_dentry(struct super_block *sb, void *vobjp)
|
|||
iput(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 *ext3_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,
|
||||
ext3_nfs_get_inode);
|
||||
}
|
||||
|
||||
static struct dentry *ext3_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,
|
||||
ext3_nfs_get_inode);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_QUOTA
|
||||
|
@ -738,8 +742,9 @@ static const struct super_operations ext3_sops = {
|
|||
};
|
||||
|
||||
static struct export_operations ext3_export_ops = {
|
||||
.fh_to_dentry = ext3_fh_to_dentry,
|
||||
.fh_to_parent = ext3_fh_to_parent,
|
||||
.get_parent = ext3_get_parent,
|
||||
.get_dentry = ext3_get_dentry,
|
||||
};
|
||||
|
||||
enum {
|
||||
|
|
Loading…
Reference in a new issue