diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-10 10:46:03 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-10 11:13:13 -0500 |
commit | 0b2c4e39c014219ef73f05ab580c284bf8e6af0a (patch) | |
tree | 4447c0dbab25dc209f267c17123845b1d3bb8273 /fs/coda/cnode.c | |
parent | 3e25eb9c4bb649acdddb333d10774b640190f727 (diff) |
coda: deal correctly with allocation failure from coda_cnode_makectl()
lookup should fail with ENOMEM, not silently make dentry negative.
Switched to saner calling conventions, while we are at it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/coda/cnode.c')
-rw-r--r-- | fs/coda/cnode.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c index 6475877b0763..8af67c9c47dd 100644 --- a/fs/coda/cnode.c +++ b/fs/coda/cnode.c | |||
@@ -156,19 +156,16 @@ struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb) | |||
156 | } | 156 | } |
157 | 157 | ||
158 | /* the CONTROL inode is made without asking attributes from Venus */ | 158 | /* the CONTROL inode is made without asking attributes from Venus */ |
159 | int coda_cnode_makectl(struct inode **inode, struct super_block *sb) | 159 | struct inode *coda_cnode_makectl(struct super_block *sb) |
160 | { | 160 | { |
161 | int error = -ENOMEM; | 161 | struct inode *inode = new_inode(sb); |
162 | 162 | if (inode) { | |
163 | *inode = new_inode(sb); | 163 | inode->i_ino = CTL_INO; |
164 | if (*inode) { | 164 | inode->i_op = &coda_ioctl_inode_operations; |
165 | (*inode)->i_ino = CTL_INO; | 165 | inode->i_fop = &coda_ioctl_operations; |
166 | (*inode)->i_op = &coda_ioctl_inode_operations; | 166 | inode->i_mode = 0444; |
167 | (*inode)->i_fop = &coda_ioctl_operations; | 167 | return inode; |
168 | (*inode)->i_mode = 0444; | ||
169 | error = 0; | ||
170 | } | 168 | } |
171 | 169 | return ERR_PTR(-ENOMEM); | |
172 | return error; | ||
173 | } | 170 | } |
174 | 171 | ||