diff options
Diffstat (limited to 'fs/efs')
-rw-r--r-- | fs/efs/namei.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/fs/efs/namei.c b/fs/efs/namei.c index 291abb11e20e..c3fb5f9c4a44 100644 --- a/fs/efs/namei.c +++ b/fs/efs/namei.c | |||
@@ -112,35 +112,14 @@ struct dentry *efs_fh_to_parent(struct super_block *sb, struct fid *fid, | |||
112 | 112 | ||
113 | struct dentry *efs_get_parent(struct dentry *child) | 113 | struct dentry *efs_get_parent(struct dentry *child) |
114 | { | 114 | { |
115 | struct dentry *parent; | 115 | struct dentry *parent = ERR_PTR(-ENOENT); |
116 | struct inode *inode; | ||
117 | efs_ino_t ino; | 116 | efs_ino_t ino; |
118 | long error; | ||
119 | 117 | ||
120 | lock_kernel(); | 118 | lock_kernel(); |
121 | |||
122 | error = -ENOENT; | ||
123 | ino = efs_find_entry(child->d_inode, "..", 2); | 119 | ino = efs_find_entry(child->d_inode, "..", 2); |
124 | if (!ino) | 120 | if (ino) |
125 | goto fail; | 121 | parent = d_obtain_alias(efs_iget(child->d_inode->i_sb, ino)); |
126 | |||
127 | inode = efs_iget(child->d_inode->i_sb, ino); | ||
128 | if (IS_ERR(inode)) { | ||
129 | error = PTR_ERR(inode); | ||
130 | goto fail; | ||
131 | } | ||
132 | |||
133 | error = -ENOMEM; | ||
134 | parent = d_alloc_anon(inode); | ||
135 | if (!parent) | ||
136 | goto fail_iput; | ||
137 | |||
138 | unlock_kernel(); | 122 | unlock_kernel(); |
139 | return parent; | ||
140 | 123 | ||
141 | fail_iput: | 124 | return parent; |
142 | iput(inode); | ||
143 | fail: | ||
144 | unlock_kernel(); | ||
145 | return ERR_PTR(error); | ||
146 | } | 125 | } |