diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-04 02:37:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-04 02:37:59 +0300 |
| commit | 8336026942fdf6a96a45057a2fe6d7f7946979d5 (patch) | |
| tree | b831d361f5865a86ec645dccd87d74922099ac22 /fs/reiserfs/namei.c | |
| parent | 4c7fd114c65830cb052b6f3d0ab5b11626e64d5d (diff) | |
| parent | 69102e9b4b61f56a26717659ec2e572a6b18458d (diff) | |
| download | linux-8336026942fdf6a96a45057a2fe6d7f7946979d5.tar.xz | |
Merge branch 'i_nlink' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'i_nlink' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
hfs: fix rename() over non-empty directory
udf: fix i_nlink limit
fix reiserfs mkdir() breakage
exofs: i_nlink races in rename()
nilfs2: i_nlink races in rename()
minix: i_nlink races in rename()
ufs: i_nlink races in rename()
sysv: i_nlink races in rename()
Diffstat (limited to 'fs/reiserfs/namei.c')
| -rw-r--r-- | fs/reiserfs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index ba5f51ec3458..68fdf45cc6c9 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c @@ -771,7 +771,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) EMPTY_DIR_SIZE_V1 : EMPTY_DIR_SIZE, dentry, inode, &security); if (retval) { - dir->i_nlink--; + DEC_DIR_INODE_NLINK(dir) goto out_failed; } |