Merge remote branch 'remotes/origin/branch-netatalk-2-1'

[netatalk.git] / etc / afpd / directory.h

diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
index dd14692faf7a910b89cc4a6b7a0d78b71c445316..0fe65e7000af0f02fe5a7e3e7049e013d4c96e16 100644 (file)
--- a/etc/afpd/directory.h
+++ b/etc/afpd/directory.h
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.h,v 1.33.4.1 2010-02-01 10:56:08 franklahm Exp $
+ * $Id: directory.h,v 1.34 2010/03/12 15:16:49 franklahm Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -48,8 +48,9 @@
 #define DIRF_AFS       (1<<0)
 #define DIRF_UFS       (2<<0)
 
-#define DIRF_OFFCNT     (1<<4) /* offsprings count is valid */
-#define DIRF_CNID      (1<<5)  /* renumerate id */
+#define DIRF_OFFCNT    (1<<4) /* offsprings count is valid */
+#define DIRF_CNID         (1<<5) /* renumerate id */
+#define DIRF_CACHELOCK (1<<6) /* lock in cache, don't remove in dircache_eviction, for catsearch */
 
 #define AFPDIR_READ    (1<<0)
 
@@ -107,10 +108,12 @@ struct maccess {
 
 typedef int (*dir_loop)(struct dirent *, char *, void *);
 
-extern struct dir *dir_new(const char *mname, const char *uname, const struct vol *, cnid_t pdid, cnid_t did, bstring fullpath); /* volume.c needs it once */
+extern struct dir *dir_new(const char *mname, const char *uname, const struct vol *,
+                           cnid_t pdid, cnid_t did, bstring fullpath); /* volume.c needs it once */
 extern void        dir_free (struct dir *);
 extern struct dir  *dir_add(const struct vol *, const struct dir *, struct path *, int);
-extern int         dir_modify(const struct vol *vol, struct dir *dir, cnid_t pdid, cnid_t did, const char *new_mname, const char *new_uname, bstring pdir_fullpath);
+extern int         dir_modify(const struct vol *vol, struct dir *dir, cnid_t pdid, cnid_t did,
+                              const char *new_mname, const char *new_uname, bstring pdir_fullpath);
 extern int         dir_remove(const struct vol *vol, struct dir *dir);
 extern struct dir  *dirlookup (const struct vol *, cnid_t);
 extern int         movecwd (const struct vol *, struct dir *);
@@ -121,19 +124,21 @@ extern mode_t      mtoumode (struct maccess *);
 extern void        utommode (struct stat *, struct maccess *);
 extern int         getdirparams (const struct vol *, u_int16_t, struct path *,
                                  struct dir *, char *, size_t *);
-extern int         setdirparams (struct vol *, struct path *, u_int16_t, char *);
-extern int         renamedir (const struct vol *, char *, char *, struct dir *,
-                              struct dir *, char *);
-extern int         path_error (struct path *, int error);
-extern void        setdiroffcnt (struct dir *dir, struct stat *st,  u_int32_t count);
-extern int         dirreenumerate (struct dir *dir, struct stat *st);
-extern int         for_each_dirent (const struct vol *, char *, dir_loop , void *);
-extern int         check_access (char *name , int mode);
-extern int         file_access   (struct path *path, int mode);
+
+extern int         setdirparams(struct vol *, struct path *, u_int16_t, char *);
+extern int         renamedir(const struct vol *, int, char *, char *, struct dir *,
+                             struct dir *, char *);
+extern int         path_error(struct path *, int error);
+extern void        setdiroffcnt(struct dir *dir, struct stat *st,  u_int32_t count);
+extern int         dirreenumerate(struct dir *dir, struct stat *st);
+extern int         for_each_dirent(const struct vol *, char *, dir_loop , void *);
+extern int         check_access(char *name , int mode);
+extern int         file_access(struct path *path, int mode);
 extern int         netatalk_unlink (const char *name);
 extern int         caseenumerate (const struct vol *, struct path *, struct dir *);
+
 /* from enumerate.c */
-extern char *check_dirent (const struct vol *, char *);
+extern char        *check_dirent (const struct vol *, char *);
 
 /* FP functions */
 int afp_createdir (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);