#include <atalk/util.h>
#include <atalk/bstrlib.h>
#include <atalk/bstradd.h>
+#include <atalk/globals.h>
+#include <atalk/fce_api.h>
-#include "globals.h"
#include "volume.h"
#include "directory.h"
#include "fork.h"
-/* we need to have a hashed list of oforks (by dev inode). just hash
- * by first letter. */
+/* we need to have a hashed list of oforks (by dev inode) */
#define OFORK_HASHSIZE 64
-static struct ofork *ofork_table[OFORK_HASHSIZE];
-
-static struct ofork **oforks = NULL;
+static struct ofork *ofork_table[OFORK_HASHSIZE]; /* forks hashed by dev/inode */
+static struct ofork **oforks = NULL; /* point to allocated table of open forks pointers */
static int nforks = 0;
static u_short lastrefnum = 0;
/* OR some of each character for the hash*/
static unsigned long hashfn(const struct file_key *key)
{
-#if 0
- unsigned long i = 0;
- while (*name) {
- i = ((i << 4) | (8*sizeof(i) - 4)) ^ *name++;
- }
-#endif
return key->inode & (OFORK_HASHSIZE - 1);
}
of_alloc(struct vol *vol,
struct dir *dir,
char *path,
- u_int16_t *ofrefnum,
+ uint16_t *ofrefnum,
const int eid,
struct adouble *ad,
struct stat *st)
{
struct ofork *of;
- u_int16_t refnum, of_refnum;
+ uint16_t refnum, of_refnum;
int i;
/* initialize to zero. This is important to ensure that
ad_open really does reinitialize the structure. */
- ad_init(ad, vol->v_adouble, vol->v_ad_options);
+ ad_init(ad, vol);
- ad->ad_m_namelen = 255 +1;
+ ad->ad_m_namelen = UTF8FILELEN_EARLY +1;
/* here's the deal: we allocate enough for the standard mac file length.
* in the future, we'll reallocate in fairly large jumps in case
* of long unicode names */
return NULL;
}
strlcpy( ad->ad_m_name, path, ad->ad_m_namelen);
+ } else {
+ /* Increase the refcount on this struct adouble. This is
+ decremented again in oforc_dealloc. */
+ ad_ref(ad);
}
- ad_ref(ad);
of->of_ad = ad;
of->of_vol = vol;
of->of_did = dir->d_did;
return( of );
}
-struct ofork *of_find(const u_int16_t ofrefnum )
+struct ofork *of_find(const uint16_t ofrefnum )
{
if (!oforks || !nforks)
return NULL;
}
-#ifdef HAVE_RENAMEAT
+#ifdef HAVE_ATFUNCS
int of_fstatat(int dirfd, struct path *path)
{
int ret;
return ret;
}
-#endif /* HAVE_RENAMEAT */
+#endif /* HAVE_ATFUNCS */
/* --------------------------
stat the current directory.
* @param dirfd (r) directory fd
* @param path (rw) pointer to struct path
*/
-#ifdef HAVE_RENAMEAT
+#ifdef HAVE_ATFUNCS
struct ofork *of_findnameat(int dirfd, struct path *path)
{
struct ofork *of;
of_unhash(of);
oforks[ of->of_refnum % nforks ] = NULL;
+
+ /* decrease refcount */
+ of->of_ad->ad_refcount--;
+
+ if ( of->of_ad->ad_refcount <= 0) {
+ free( of->of_ad->ad_m_name );
+ 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);
+ }
+
free( of );
}
int of_closefork(struct ofork *ofork)
{
struct timeval tv;
- int doflush = 0;
+ int adflags = 0;
int ret;
- if ( (ofork->of_flags & AFPFORK_OPEN) && ad_reso_fileno( ofork->of_ad ) != -1 ) {
- /*
- * Only set the rfork's length if we're closing the rfork.
- */
- if ((ofork->of_flags & AFPFORK_RSRC)) {
- ad_refresh( ofork->of_ad );
- if ((ofork->of_flags & AFPFORK_DIRTY) && !gettimeofday(&tv, NULL)) {
- ad_setdate(ofork->of_ad, AD_DATE_MODIFY | AD_DATE_UNIX,tv.tv_sec);
- doflush++;
- }
- if ( doflush ) {
- ad_flush( ofork->of_ad );
- }
+ adflags = 0;
+ if (ofork->of_flags & AFPFORK_DATA)
+ adflags |= ADFLAGS_DF;
+ if (ofork->of_flags & AFPFORK_META)
+ adflags |= ADFLAGS_HF;
+ if (ofork->of_flags & AFPFORK_RSRC) {
+ adflags |= ADFLAGS_RF;
+ /* Only set the rfork's length if we're closing the rfork. */
+ ad_refresh(NULL, ofork->of_ad );
+ if ((ofork->of_flags & AFPFORK_DIRTY) && !gettimeofday(&tv, NULL)) {
+ ad_setdate(ofork->of_ad, AD_DATE_MODIFY | AD_DATE_UNIX,tv.tv_sec);
+ ad_flush( ofork->of_ad );
}
}
- ret = 0;
- ad_unlock(ofork->of_ad, ofork->of_refnum);
-
- if (ad_unref(ofork->of_ad) == 0) {
- if ( ad_close( ofork->of_ad, 0 ) < 0 ) {
- ret = -1;
- }
+ /* Somone has used write_fork, we assume file was changed, register it to file change event api */
+ if (ofork->of_flags & AFPFORK_MODIFIED) {
+ fce_register_file_modification(ofork);
+ }
+
+ ret = 0;
+ if ( ad_close( ofork->of_ad, adflags | ADFLAGS_SETSHRMD) < 0 ) {
+ ret = -1;
}
of_dealloc( ofork );
if ((of = of_findname(path))) {
adp = of->of_ad;
} else {
- ad_init(ad, vol->v_adouble, vol->v_ad_options);
+ ad_init(ad, vol);
adp = ad;
}
return adp;
return;
}
+/* ----------------------
+ close all forks for a volume
+*/
+void of_close_all_forks(void)
+{
+ int refnum;
+
+ if (!oforks)
+ return;
+
+ for ( refnum = 0; refnum < nforks; refnum++ ) {
+ if (oforks[ refnum ] != NULL) {
+ if (of_closefork( oforks[ refnum ]) < 0 ) {
+ LOG(log_error, logtype_afpd, "of_close_all_forks: %s", strerror(errno) );
+ }
+ }
+ }
+ return;
+}
+
projects / netatalk.git / blobdiff