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

Btrfs: cleanup d_obtain_alias useage

Browse Source 
d_obtain_alias is intended as a tailcall that can pass in errors encoded
in the inode pointer if needed, so use it that way instead of
duplicating the error handling.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Christoph Hellwig
2008-09-05 16:43:20 -04:00
committed by Chris Mason
parent 91c0827de2
commit 50ec891cc5
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fs/btrfs/export.c
View File

@@ -68,7 +68,6 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
{ {
struct btrfs_root *root; struct btrfs_root *root;
struct inode *inode; struct inode *inode;
struct dentry *result;
struct btrfs_key key; struct btrfs_key key;
key.objectid = root_objectid; key.objectid = root_objectid;
@@ -92,11 +91,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
return ERR_PTR(-ESTALE); return ERR_PTR(-ESTALE);
} }
result = d_obtain_alias(inode); return d_obtain_alias(inode);
if (!result)
return ERR_PTR(-ENOMEM);
return result;
} }
static struct dentry *btrfs_fh_to_parent(struct super_block *sb, struct fid *fh, static struct dentry *btrfs_fh_to_parent(struct super_block *sb, struct fid *fh,
@@ -148,8 +143,6 @@ static struct dentry *btrfs_fh_to_dentry(struct super_block *sb, struct fid *fh,
static struct dentry *btrfs_get_parent(struct dentry *child) static struct dentry *btrfs_get_parent(struct dentry *child)
{ {
struct inode *dir = child->d_inode; struct inode *dir = child->d_inode;
struct inode *inode;
struct dentry *parent;
struct btrfs_root *root = BTRFS_I(dir)->root; struct btrfs_root *root = BTRFS_I(dir)->root;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_path *path; struct btrfs_path *path;
@@ -203,13 +196,7 @@ static struct dentry *btrfs_get_parent(struct dentry *child)
btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
key.offset = 0; key.offset = 0;
inode = btrfs_iget(root->fs_info->sb, &key, root, NULL); return d_obtain_alias(btrfs_iget(root->fs_info->sb, &key, root, NULL));
parent = d_obtain_alias(inode);
if (!parent)
parent = ERR_PTR(-ENOMEM);
return parent;
} }
const struct export_operations btrfs_export_ops = { const struct export_operations btrfs_export_ops = {