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

Update the code to the current sync(2) version:

Browse Source 
- Do not modify mnt_flag without mount interlock held.
- Do not touch MNT_ASYNC flag, as this can lead to a race with nmount(2).

Pointed out by:	tegge
Reviewed by:	tegge
This commit is contained in:
Pawel Jakub Dawidek 2006-11-01 09:37:11 +00:00
parent 6634ef3651
commit 3911a26e74
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/geom/journal/g_journal.c
View File

@ -2850,7 +2850,7 @@ g_journal_do_switch(struct g_class *classp, struct thread *td)
struct mount *mp;
struct bintime bt;
char *mountpoint;
int asyncflag, error, vfslocked;
int error, vfslocked;
DROP_GIANT();
g_topology_lock();
@ -2911,8 +2911,11 @@ g_journal_do_switch(struct g_class *classp, struct thread *td)
mountpoint, error);
goto next;
}
asyncflag = mp->mnt_flag & MNT_ASYNC;
mp->mnt_flag &= ~MNT_ASYNC;
MNT_ILOCK(mp);
mp->mnt_noasync++;
mp->mnt_kern_flag &= ~MNTK_ASYNC;
MNT_IUNLOCK(mp);
GJ_TIMER_START(1, &bt);
vfs_msync(mp, MNT_NOWAIT);
@ -2926,7 +2929,12 @@ g_journal_do_switch(struct g_class *classp, struct thread *td)
GJ_DEBUG(0, "Cannot sync file system %s (error=%d).",
mountpoint, error);
}
mp->mnt_flag |= asyncflag;
MNT_ILOCK(mp);
mp->mnt_noasync--;
if ((mp->mnt_flag & MNT_ASYNC) != 0 && mp->mnt_noasync == 0)
mp->mnt_kern_flag |= MNTK_ASYNC;
MNT_IUNLOCK(mp);
vn_finished_write(mp);