diff options
Diffstat (limited to 'fs/hfsplus/inode.c')
-rw-r--r-- | fs/hfsplus/inode.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index fc98583cf045..7acff6c5464f 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c | |||
@@ -182,11 +182,6 @@ static struct dentry *hfsplus_file_lookup(struct inode *dir, struct dentry *dent | |||
182 | igrab(dir); | 182 | igrab(dir); |
183 | hlist_add_head(&inode->i_hash, &HFSPLUS_SB(sb).rsrc_inodes); | 183 | hlist_add_head(&inode->i_hash, &HFSPLUS_SB(sb).rsrc_inodes); |
184 | mark_inode_dirty(inode); | 184 | mark_inode_dirty(inode); |
185 | { | ||
186 | void hfsplus_inode_check(struct super_block *sb); | ||
187 | atomic_inc(&HFSPLUS_SB(sb).inode_cnt); | ||
188 | hfsplus_inode_check(sb); | ||
189 | } | ||
190 | out: | 185 | out: |
191 | d_add(dentry, inode); | 186 | d_add(dentry, inode); |
192 | return NULL; | 187 | return NULL; |
@@ -276,13 +271,13 @@ static int hfsplus_file_release(struct inode *inode, struct file *file) | |||
276 | if (atomic_read(&file->f_count) != 0) | 271 | if (atomic_read(&file->f_count) != 0) |
277 | return 0; | 272 | return 0; |
278 | if (atomic_dec_and_test(&HFSPLUS_I(inode).opencnt)) { | 273 | if (atomic_dec_and_test(&HFSPLUS_I(inode).opencnt)) { |
279 | down(&inode->i_sem); | 274 | mutex_lock(&inode->i_mutex); |
280 | hfsplus_file_truncate(inode); | 275 | hfsplus_file_truncate(inode); |
281 | if (inode->i_flags & S_DEAD) { | 276 | if (inode->i_flags & S_DEAD) { |
282 | hfsplus_delete_cat(inode->i_ino, HFSPLUS_SB(sb).hidden_dir, NULL); | 277 | hfsplus_delete_cat(inode->i_ino, HFSPLUS_SB(sb).hidden_dir, NULL); |
283 | hfsplus_delete_inode(inode); | 278 | hfsplus_delete_inode(inode); |
284 | } | 279 | } |
285 | up(&inode->i_sem); | 280 | mutex_unlock(&inode->i_mutex); |
286 | } | 281 | } |
287 | return 0; | 282 | return 0; |
288 | } | 283 | } |
@@ -317,11 +312,6 @@ struct inode *hfsplus_new_inode(struct super_block *sb, int mode) | |||
317 | if (!inode) | 312 | if (!inode) |
318 | return NULL; | 313 | return NULL; |
319 | 314 | ||
320 | { | ||
321 | void hfsplus_inode_check(struct super_block *sb); | ||
322 | atomic_inc(&HFSPLUS_SB(sb).inode_cnt); | ||
323 | hfsplus_inode_check(sb); | ||
324 | } | ||
325 | inode->i_ino = HFSPLUS_SB(sb).next_cnid++; | 315 | inode->i_ino = HFSPLUS_SB(sb).next_cnid++; |
326 | inode->i_mode = mode; | 316 | inode->i_mode = mode; |
327 | inode->i_uid = current->fsuid; | 317 | inode->i_uid = current->fsuid; |