diff options
Diffstat (limited to 'fs/hpfs/namei.c')
-rw-r--r-- | fs/hpfs/namei.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c index 59e7dc182a0c..2507e7393f3c 100644 --- a/fs/hpfs/namei.c +++ b/fs/hpfs/namei.c | |||
@@ -89,7 +89,7 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
89 | brelse(bh); | 89 | brelse(bh); |
90 | hpfs_mark_4buffers_dirty(&qbh0); | 90 | hpfs_mark_4buffers_dirty(&qbh0); |
91 | hpfs_brelse4(&qbh0); | 91 | hpfs_brelse4(&qbh0); |
92 | dir->i_nlink++; | 92 | inc_nlink(dir); |
93 | insert_inode_hash(result); | 93 | insert_inode_hash(result); |
94 | 94 | ||
95 | if (result->i_uid != current->fsuid || | 95 | if (result->i_uid != current->fsuid || |
@@ -434,7 +434,7 @@ again: | |||
434 | unlock_kernel(); | 434 | unlock_kernel(); |
435 | return -ENOSPC; | 435 | return -ENOSPC; |
436 | default: | 436 | default: |
437 | inode->i_nlink--; | 437 | drop_nlink(inode); |
438 | err = 0; | 438 | err = 0; |
439 | } | 439 | } |
440 | goto out; | 440 | goto out; |
@@ -494,8 +494,8 @@ static int hpfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
494 | err = -ENOSPC; | 494 | err = -ENOSPC; |
495 | break; | 495 | break; |
496 | default: | 496 | default: |
497 | dir->i_nlink--; | 497 | drop_nlink(dir); |
498 | inode->i_nlink = 0; | 498 | clear_nlink(inode); |
499 | err = 0; | 499 | err = 0; |
500 | } | 500 | } |
501 | goto out; | 501 | goto out; |
@@ -590,7 +590,7 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
590 | int r; | 590 | int r; |
591 | if ((r = hpfs_remove_dirent(old_dir, dno, dep, &qbh, 1)) != 2) { | 591 | if ((r = hpfs_remove_dirent(old_dir, dno, dep, &qbh, 1)) != 2) { |
592 | if ((nde = map_dirent(new_dir, hpfs_i(new_dir)->i_dno, (char *)new_name, new_len, NULL, &qbh1))) { | 592 | if ((nde = map_dirent(new_dir, hpfs_i(new_dir)->i_dno, (char *)new_name, new_len, NULL, &qbh1))) { |
593 | new_inode->i_nlink = 0; | 593 | clear_nlink(new_inode); |
594 | copy_de(nde, &de); | 594 | copy_de(nde, &de); |
595 | memcpy(nde->name, new_name, new_len); | 595 | memcpy(nde->name, new_name, new_len); |
596 | hpfs_mark_4buffers_dirty(&qbh1); | 596 | hpfs_mark_4buffers_dirty(&qbh1); |
@@ -635,8 +635,8 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
635 | end: | 635 | end: |
636 | hpfs_i(i)->i_parent_dir = new_dir->i_ino; | 636 | hpfs_i(i)->i_parent_dir = new_dir->i_ino; |
637 | if (S_ISDIR(i->i_mode)) { | 637 | if (S_ISDIR(i->i_mode)) { |
638 | new_dir->i_nlink++; | 638 | inc_nlink(new_dir); |
639 | old_dir->i_nlink--; | 639 | drop_nlink(old_dir); |
640 | } | 640 | } |
641 | if ((fnode = hpfs_map_fnode(i->i_sb, i->i_ino, &bh))) { | 641 | if ((fnode = hpfs_map_fnode(i->i_sb, i->i_ino, &bh))) { |
642 | fnode->up = new_dir->i_ino; | 642 | fnode->up = new_dir->i_ino; |