lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext2: new export ops

Browse Source 
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig
2007-10-21 16:42:07 -07:00
committed by Linus Torvalds
parent 2596110a39
commit 2e4c68e303
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
fs/ext2/super.c
View File

@@ -311,13 +311,10 @@ static const struct super_operations ext2_sops = {
#endif #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 inode *inode;
struct dentry *result;
if (ino < EXT2_FIRST_INO(sb) && ino != EXT2_ROOT_INO) if (ino < EXT2_FIRST_INO(sb) && ino != EXT2_ROOT_INO)
return ERR_PTR(-ESTALE); return ERR_PTR(-ESTALE);
@@ -338,15 +335,21 @@ static struct dentry *ext2_get_dentry(struct super_block *sb, void *vobjp)
iput(inode); iput(inode);
return ERR_PTR(-ESTALE); return ERR_PTR(-ESTALE);
} }
/* now to find a dentry. return inode;
* If possible, get a well-connected one }
*/
result = d_alloc_anon(inode); static struct dentry *ext2_fh_to_dentry(struct super_block *sb, struct fid *fid,
if (!result) { int fh_len, int fh_type)
iput(inode); {
return ERR_PTR(-ENOMEM); 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!! /* 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. * Currently only get_parent is required.
*/ */
static struct export_operations ext2_export_ops = { 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_parent = ext2_get_parent,
.get_dentry = ext2_get_dentry,
}; };
static unsigned long get_sb_block(void **data) static unsigned long get_sb_block(void **data)