diff options
author | Christoph Hellwig <hch@lst.de> | 2008-08-11 09:49:04 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-23 05:13:01 -0400 |
commit | 440037287c5ebb07033ab927ca16bb68c291d309 (patch) | |
tree | c4be3843ea87a777c2647f471895917005d8068f /fs/isofs/export.c | |
parent | 4ea3ada2955e4519befa98ff55dd62d6dfbd1705 (diff) |
[PATCH] switch all filesystems over to d_obtain_alias
Switch all users of d_alloc_anon to d_obtain_alias.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/isofs/export.c')
-rw-r--r-- | fs/isofs/export.c | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/fs/isofs/export.c b/fs/isofs/export.c index bb219138331a..e81a30593ba9 100644 --- a/fs/isofs/export.c +++ b/fs/isofs/export.c | |||
@@ -22,7 +22,7 @@ isofs_export_iget(struct super_block *sb, | |||
22 | __u32 generation) | 22 | __u32 generation) |
23 | { | 23 | { |
24 | struct inode *inode; | 24 | struct inode *inode; |
25 | struct dentry *result; | 25 | |
26 | if (block == 0) | 26 | if (block == 0) |
27 | return ERR_PTR(-ESTALE); | 27 | return ERR_PTR(-ESTALE); |
28 | inode = isofs_iget(sb, block, offset); | 28 | inode = isofs_iget(sb, block, offset); |
@@ -32,12 +32,7 @@ isofs_export_iget(struct super_block *sb, | |||
32 | iput(inode); | 32 | iput(inode); |
33 | return ERR_PTR(-ESTALE); | 33 | return ERR_PTR(-ESTALE); |
34 | } | 34 | } |
35 | result = d_alloc_anon(inode); | 35 | return d_obtain_alias(inode); |
36 | if (!result) { | ||
37 | iput(inode); | ||
38 | return ERR_PTR(-ENOMEM); | ||
39 | } | ||
40 | return result; | ||
41 | } | 36 | } |
42 | 37 | ||
43 | /* This function is surprisingly simple. The trick is understanding | 38 | /* This function is surprisingly simple. The trick is understanding |
@@ -51,7 +46,6 @@ static struct dentry *isofs_export_get_parent(struct dentry *child) | |||
51 | unsigned long parent_offset = 0; | 46 | unsigned long parent_offset = 0; |
52 | struct inode *child_inode = child->d_inode; | 47 | struct inode *child_inode = child->d_inode; |
53 | struct iso_inode_info *e_child_inode = ISOFS_I(child_inode); | 48 | struct iso_inode_info *e_child_inode = ISOFS_I(child_inode); |
54 | struct inode *parent_inode = NULL; | ||
55 | struct iso_directory_record *de = NULL; | 49 | struct iso_directory_record *de = NULL; |
56 | struct buffer_head * bh = NULL; | 50 | struct buffer_head * bh = NULL; |
57 | struct dentry *rv = NULL; | 51 | struct dentry *rv = NULL; |
@@ -104,28 +98,11 @@ static struct dentry *isofs_export_get_parent(struct dentry *child) | |||
104 | /* Normalize */ | 98 | /* Normalize */ |
105 | isofs_normalize_block_and_offset(de, &parent_block, &parent_offset); | 99 | isofs_normalize_block_and_offset(de, &parent_block, &parent_offset); |
106 | 100 | ||
107 | /* Get the inode. */ | 101 | rv = d_obtain_alias(isofs_iget(child_inode->i_sb, parent_block, |
108 | parent_inode = isofs_iget(child_inode->i_sb, | 102 | parent_offset)); |
109 | parent_block, | ||
110 | parent_offset); | ||
111 | if (IS_ERR(parent_inode)) { | ||
112 | rv = ERR_CAST(parent_inode); | ||
113 | if (rv != ERR_PTR(-ENOMEM)) | ||
114 | rv = ERR_PTR(-EACCES); | ||
115 | goto out; | ||
116 | } | ||
117 | |||
118 | /* Allocate the dentry. */ | ||
119 | rv = d_alloc_anon(parent_inode); | ||
120 | if (rv == NULL) { | ||
121 | rv = ERR_PTR(-ENOMEM); | ||
122 | goto out; | ||
123 | } | ||
124 | |||
125 | out: | 103 | out: |
126 | if (bh) { | 104 | if (bh) |
127 | brelse(bh); | 105 | brelse(bh); |
128 | } | ||
129 | return rv; | 106 | return rv; |
130 | } | 107 | } |
131 | 108 | ||