diff options
author | kib <kib@FreeBSD.org> | 2016-02-17 19:43:03 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2016-02-17 19:43:03 +0000 |
commit | 9d6a6ca5611999f959b8e11ee855e3322db6f8cf (patch) | |
tree | 58540661db6ffa79911a3c19cbae6e4f5bbf756d /sys/fs | |
parent | a5f88cf93faec476bfcd6a7b8a86d9a1962e4746 (diff) | |
download | FreeBSD-src-9d6a6ca5611999f959b8e11ee855e3322db6f8cf.zip FreeBSD-src-9d6a6ca5611999f959b8e11ee855e3322db6f8cf.tar.gz |
After nullfs rmdir operation, reclaim the directory vnode which was
unlinked. Otherwise the vnode stays cached, causing leak. This is
similar to r292961 for regular files.
Reported and tested by: pho (previous version)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/nullfs/null_vnops.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 72b884f..ec7d046 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -619,6 +619,14 @@ null_rename(struct vop_rename_args *ap) return (null_bypass((struct vop_generic_args *)ap)); } +static int +null_rmdir(struct vop_rmdir_args *ap) +{ + + VTONULL(ap->a_vp)->null_flags |= NULLV_DROP; + return (null_bypass(&ap->a_gen)); +} + /* * We need to process our own vnode lock and then clear the * interlock flag as it applies only to our vnode, not the @@ -920,6 +928,7 @@ struct vop_vector null_vnodeops = { .vop_reclaim = null_reclaim, .vop_remove = null_remove, .vop_rename = null_rename, + .vop_rmdir = null_rmdir, .vop_setattr = null_setattr, .vop_strategy = VOP_EOPNOTSUPP, .vop_unlock = null_unlock, |