diff options
| author | kib <kib@FreeBSD.org> | 2016-05-16 02:21:54 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-05-16 02:21:54 +0000 |
| commit | 4b9538383708f5f2d1349c7e4a57ed138038e61a (patch) | |
| tree | 8511901b41d4b136015cf1f12a80069a81315fb8 /sys/kern | |
| parent | d243f9a977377857cfa7b78dabaa86ddcbbe82b1 (diff) | |
| download | FreeBSD-src-4b9538383708f5f2d1349c7e4a57ed138038e61a.zip FreeBSD-src-4b9538383708f5f2d1349c7e4a57ed138038e61a.tar.gz | |
MFC r298921:
Fix reporting of NOTE_LINK when directory link count changes due to
rename removing or adding subdirectory entry.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_subr.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index aa81313..de57452 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -4365,10 +4365,26 @@ void vop_rename_post(void *ap, int rc) { struct vop_rename_args *a = ap; + long hint; if (!rc) { - VFS_KNOTE_UNLOCKED(a->a_fdvp, NOTE_WRITE); - VFS_KNOTE_UNLOCKED(a->a_tdvp, NOTE_WRITE); + hint = NOTE_WRITE; + if (a->a_fdvp == a->a_tdvp) { + if (a->a_tvp != NULL && a->a_tvp->v_type == VDIR) + hint |= NOTE_LINK; + VFS_KNOTE_UNLOCKED(a->a_fdvp, hint); + VFS_KNOTE_UNLOCKED(a->a_tdvp, hint); + } else { + if (a->a_fvp->v_type == VDIR) + hint |= NOTE_LINK; + VFS_KNOTE_UNLOCKED(a->a_fdvp, hint); + + if (a->a_fvp->v_type == VDIR && a->a_tvp != NULL && + a->a_tvp->v_type == VDIR) + hint &= ~NOTE_LINK; + VFS_KNOTE_UNLOCKED(a->a_tdvp, hint); + } + VFS_KNOTE_UNLOCKED(a->a_fvp, NOTE_RENAME); if (a->a_tvp) VFS_KNOTE_UNLOCKED(a->a_tvp, NOTE_DELETE); |
