Redesign ad_open API to only use one arg for all flags, fix locking for adouble:v2

[netatalk.git] / etc / afpd / filedir.c

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index 61386d66f4e09064aae40668223458ecff6ed691..f98f79c79c45375b25bd254f0fb808dff8e63c7f 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -305,7 +305,7 @@ static int moveandrename(const struct vol *vol,
 
         ad_getattr(adp, &bshort);
         
-        ad_close_metadata( adp);
+        ad_close(adp, ADFLAGS_HF);
         if ((bshort & htons(ATTRBIT_NORENAME))) {
             rc = AFPERR_OLOCK;
             goto exit;
@@ -380,7 +380,7 @@ static int moveandrename(const struct vol *vol,
         if (!ad_metadata(upath, adflags, adp)) {
             ad_setid(adp, st->st_dev, st->st_ino, id, curdir->d_did, vol->v_stamp);
             ad_flush(adp);
-            ad_close_metadata(adp);
+            ad_close(adp, ADFLAGS_HF);
         }
 
         /* fix up the catalog entry */