mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 01:20:54 +00:00
afs: Fix the nlink handling of dir-over-dir rename
commitf610a5a29c
upstream. Fix rename of one directory over another such that the nlink on the deleted directory is cleared to 0 rather than being decremented to 1. This was causing the generic/035 xfstest to fail. Fixes:e49c7b2f6d
("afs: Build an abstraction around an "operation" concept") Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Marc Dionne <marc.dionne@auristor.com> cc: linux-afs@lists.infradead.org Link: https://lore.kernel.org/r/162194384460.3999479.7605572278074191079.stgit@warthog.procyon.org.uk/ # v1 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ce23a0ad49
commit
ee8a8dd10e
1 changed files with 3 additions and 1 deletions
|
@ -1837,7 +1837,9 @@ static void afs_rename_edit_dir(struct afs_operation *op)
|
|||
new_inode = d_inode(new_dentry);
|
||||
if (new_inode) {
|
||||
spin_lock(&new_inode->i_lock);
|
||||
if (new_inode->i_nlink > 0)
|
||||
if (S_ISDIR(new_inode->i_mode))
|
||||
clear_nlink(new_inode);
|
||||
else if (new_inode->i_nlink > 0)
|
||||
drop_nlink(new_inode);
|
||||
spin_unlock(&new_inode->i_lock);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue