d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ufs_rename(): only do softdep_prerename() when other thread changed a vnode

Browse Source 
Reviewed by:	mckusick
Discussed with:	markj
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
Differential revision:	https://reviews.freebsd.org/D30041
This commit is contained in:
Konstantin Belousov 2021-04-30 01:39:57 +03:00
parent d4d289cd51
commit f756546662
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/ufs/ufs/ufs_vnops.c
View File

@ -1248,6 +1248,7 @@ ufs_rename(ap)
int error = 0;
struct mount *mp;
ino_t ino;
seqc_t fdvp_s, fvp_s, tdvp_s, tvp_s;
bool want_seqc_end;
want_seqc_end = false;
@ -1271,6 +1272,8 @@ ufs_rename(ap)
mp = NULL;
goto releout;
}
fdvp_s = fvp_s = tdvp_s = tvp_s = SEQC_MOD;
relock:
/*
* We need to acquire 2 to 4 locks depending on whether tvp is NULL
@ -1364,10 +1367,20 @@ ufs_rename(ap)
}
}
if (DOINGSUJ(fdvp)) {
if (DOINGSUJ(fdvp) &&
(seqc_in_modify(fdvp_s) || !vn_seqc_consistent(fdvp, fdvp_s) ||
seqc_in_modify(fvp_s) || !vn_seqc_consistent(fvp, fvp_s) ||
seqc_in_modify(tdvp_s) || !vn_seqc_consistent(tdvp, tdvp_s) ||
(tvp != NULL && (seqc_in_modify(tvp_s) ||
!vn_seqc_consistent(tvp, tvp_s))))) {
error = softdep_prerename(fdvp, fvp, tdvp, tvp);
if (error != 0) {
if (error == ERELOOKUP) {
fdvp_s = vn_seqc_read_any(fdvp);
fvp_s = vn_seqc_read_any(fvp);
tdvp_s = vn_seqc_read_any(tdvp);
if (tvp != NULL)
tvp_s = vn_seqc_read_any(tvp);
atomic_add_int(&rename_restarts, 1);
goto relock;
}