}
#endif
-void of_dealloc( struct ofork *of)
+void of_dealloc(const AFPObj *obj, struct ofork *of)
{
if (!oforks)
return;
free( of->of_ad);
} else {/* someone's still using it. just free this user's locks */
ad_unlock(of->of_ad, of->of_refnum, of->of_flags & AFPFORK_ERROR ? 0 : 1);
+#ifdef HAVE_FSHARE_T
+ if (obj->options.flags & OPTION_SHARE_RESERV) {
+ fshare_t shmd;
+ shmd.f_id = of->of_refnum;
+ if (AD_DATA_OPEN(of->of_ad))
+ fcntl(ad_data_fileno(of->of_ad), F_UNSHARE, &shmd);
+ if (AD_RSRC_OPEN(of->of_ad))
+ fcntl(ad_reso_fileno(of->of_ad), F_UNSHARE, &shmd);
+ }
+#endif
}
free( of );
}
/* --------------------------- */
-int of_closefork(struct ofork *ofork)
+int of_closefork(const AFPObj *obj, struct ofork *ofork)
{
struct timeval tv;
int adflags = 0;
fce_register_file_modification(ofork);
}
+ of_dealloc(obj, ofork);
+
ret = 0;
if ( ad_close( ofork->of_ad, adflags | ADFLAGS_SETSHRMD) < 0 ) {
ret = -1;
}
- of_dealloc( ofork );
return ret;
}
/* ----------------------
close all forks for a volume
*/
-void of_closevol(const struct vol *vol)
+void of_closevol(const AFPObj *obj, const struct vol *vol)
{
int refnum;
for ( refnum = 0; refnum < nforks; refnum++ ) {
if (oforks[ refnum ] != NULL && oforks[refnum]->of_vol == vol) {
- if (of_closefork( oforks[ refnum ]) < 0 ) {
+ if (of_closefork(obj, oforks[ refnum ]) < 0 ) {
LOG(log_error, logtype_afpd, "of_closevol: %s", strerror(errno) );
}
}
/* ----------------------
close all forks for a volume
*/
-void of_close_all_forks(void)
+void of_close_all_forks(const AFPObj *obj)
{
int refnum;
for ( refnum = 0; refnum < nforks; refnum++ ) {
if (oforks[ refnum ] != NULL) {
- if (of_closefork( oforks[ refnum ]) < 0 ) {
+ if (of_closefork(obj, oforks[ refnum ]) < 0 ) {
LOG(log_error, logtype_afpd, "of_close_all_forks: %s", strerror(errno) );
}
}