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

ufs vnops: brace softdep_prelink() with DOINGSUJ instead of DOINGSOFTDEP

Browse Source 
because softdep_prelink() is reverted to NOP for non-J case.  There is no
need to do anything before ufs_direnter() in SU/non-J case, everything
required to sync the directory is done in VOP_VPUT_PAIR().

Suggested by:	mckusick
Reviewed by:	chs, mckusick
Tested by:	pho
MFC after:	2 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Konstantin Belousov 2021-01-24 01:12:39 +02:00
parent ede40b0675
commit 6aed2435c8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1006,7 +1006,7 @@ ufs_remove(ap)
if ((ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND)) ||
(VTOI(dvp)->i_flags & APPEND))
return (EPERM);
if (DOINGSOFTDEP(dvp)) {
if (DOINGSUJ(dvp)) {
error = softdep_prelink(dvp, vp);
if (error != 0) {
MPASS(error == ERELOOKUP);
@ -1071,7 +1071,7 @@ ufs_link(ap)
panic("ufs_link: no name");
#endif
if (DOINGSOFTDEP(tdvp)) {
if (DOINGSUJ(tdvp)) {
error = softdep_prelink(tdvp, vp);
if (error != 0) {
MPASS(error == ERELOOKUP);
@ -1142,7 +1142,7 @@ ufs_whiteout(ap)
struct direct newdir;
int error = 0;
if (DOINGSOFTDEP(dvp) && (ap->a_flags == CREATE ||
if (DOINGSUJ(dvp) && (ap->a_flags == CREATE ||
ap->a_flags == DELETE)) {
error = softdep_prelink(dvp, NULL);
if (error != 0) {
@ -1945,7 +1945,7 @@ ufs_mkdir(ap)
goto out;
}
if (DOINGSOFTDEP(dvp)) {
if (DOINGSUJ(dvp)) {
error = softdep_prelink(dvp, NULL);
if (error != 0) {
MPASS(error == ERELOOKUP);
@ -2209,7 +2209,7 @@ ufs_rmdir(ap)
error = EINVAL;
goto out;
}
if (DOINGSOFTDEP(dvp)) {
if (DOINGSUJ(dvp)) {
error = softdep_prelink(dvp, vp);
if (error != 0) {
MPASS(error == ERELOOKUP);
@ -2736,7 +2736,7 @@ ufs_makeinode(mode, dvp, vpp, cnp, callfunc)
print_bad_link_count(callfunc, dvp);
return (EINVAL);
}
if (DOINGSOFTDEP(dvp)) {
if (DOINGSUJ(dvp)) {
error = softdep_prelink(dvp, NULL);
if (error != 0) {
MPASS(error == ERELOOKUP);