Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e4c68e3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

ext2: new export ops 



Trivial switch over to the new generic helpers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Neil Brown <neilb@suse.de>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2596110a

fs/ext2/super.c

+19 −15
Original line number Diff line number Diff line
@@ -311,13 +311,10 @@ static const struct super_operations ext2_sops = { 
#endif

};



static struct dentry *ext2_get_dentry(struct super_block *sb, void *vobjp)

static struct inode *ext2_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 < EXT2_FIRST_INO(sb) && ino != EXT2_ROOT_INO)

		return ERR_PTR(-ESTALE);
@@ -338,15 +335,21 @@ static struct dentry *ext2_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 inode;

}



static struct dentry *ext2_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,

				    ext2_nfs_get_inode);

}

	return result;



static struct dentry *ext2_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,

				    ext2_nfs_get_inode);

}



/* Yes, most of these are left as NULL!!
@@ -355,8 +358,9 @@ static struct dentry *ext2_get_dentry(struct super_block *sb, void *vobjp) 
 * Currently only get_parent is required.

 */

static struct export_operations ext2_export_ops = {

	.fh_to_dentry = ext2_fh_to_dentry,

	.fh_to_parent = ext2_fh_to_parent,

	.get_parent = ext2_get_parent,

	.get_dentry = ext2_get_dentry,

};



static unsigned long get_sb_block(void **data)