From 9ddc4f2a1717455e50eb6fd010cda4e5f4080c42 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 31 Oct 2016 19:18:41 +0100 Subject: libdiskfs: Factorize code for last hard reference being released * libdiskfs/node-lastref.c: New file * libdiskfs/Makefile (OTHERSRCS): Add node-lastref.c * libdiskfs/libdiskfs/node-nput.c (diskfs_nput): Replace last hard reference code with a call to _diskfs_lastref. * libdiskfs/node-nrele.c (diskfs_nrele): Likewise. --- libdiskfs/node-nput.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'libdiskfs/node-nput.c') diff --git a/libdiskfs/node-nput.c b/libdiskfs/node-nput.c index d59769b6..73f6b2c2 100644 --- a/libdiskfs/node-nput.c +++ b/libdiskfs/node-nput.c @@ -34,29 +34,7 @@ diskfs_nput (struct node *np) refcounts_demote (&np->refcounts, &result); if (result.hard == 0) - { - /* This is our cue that something akin to "last process closes file" - in the POSIX.1 sense happened, so make sure any pending node time - updates now happen in a timely fashion. */ - diskfs_set_node_times (np); - diskfs_lost_hardrefs (np); - if (!np->dn_stat.st_nlink) - { - if (np->sockaddr != MACH_PORT_NULL) - { - mach_port_deallocate (mach_task_self (), np->sockaddr); - np->sockaddr = MACH_PORT_NULL; - } - - /* There are no links. If there are soft references that - can be dropped, we can't let them postpone deallocation. - So attempt to drop them. But that's a user-supplied - routine, which might result in further recursive calls to - the ref-counting system. This is not a problem, as we - hold a weak reference ourselves. */ - diskfs_try_dropping_softrefs (np); - } - } + _diskfs_lastref (np); /* Finally get rid of our reference. */ refcounts_deref_weak (&np->refcounts, &result); -- cgit v1.2.3