diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-21 21:49:09 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-23 01:42:11 +0200 |
| commit | 841590ce16c19a3ce38028adfc8b1955482ee00c (patch) | |
| tree | 83f20931de0103f1b3b60f6ba4b8aa8490c08084 /fs/libfs.c | |
| parent | mm/truncate.c: fix build for CONFIG_BLOCK not enabled (diff) | |
| download | linux-841590ce16c19a3ce38028adfc8b1955482ee00c.tar.xz linux-841590ce16c19a3ce38028adfc8b1955482ee00c.zip | |
fix IN_DELETE_SELF on overwriting rename() on ramfs et.al.
On ramfs and other simple_rename() users IN_DELETE_SELF is not generated
for victim of overwriting rename() if it's is a directory. Works on
most of the local filesystems and really trivial to fix...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
| -rw-r--r-- | fs/libfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/libfs.c b/fs/libfs.c index 8f2271a5df53..c18e9a1235b6 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -328,8 +328,10 @@ int simple_rename(struct inode *old_dir, struct dentry *old_dentry, if (new_dentry->d_inode) { simple_unlink(new_dir, new_dentry); - if (they_are_dirs) + if (they_are_dirs) { + drop_nlink(new_dentry->d_inode); drop_nlink(old_dir); + } } else if (they_are_dirs) { drop_nlink(old_dir); inc_nlink(new_dir); |