Merge from branch-2-1

[netatalk.git] / include / atalk / directory.h

diff --git a/include/atalk/directory.h b/include/atalk/directory.h
index dd889dbb874018677e8dcc0861c4e2fe777101bf..d15c048940e772229334e10f5f50aad76eefb9da 100644 (file)
--- a/include/atalk/directory.h
+++ b/include/atalk/directory.h
@@ -1,6 +1,4 @@
 /*
- * $Id: directory.h,v 1.3.2.1 2010-02-01 10:56:08 franklahm Exp $
- *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -57,8 +55,8 @@ struct dir {
                                      /* will just point to the same storage as d_m_name !! */
     ucs2_t      *d_m_name_ucs2;       /* mac name as UCS2 */
     qnode_t     *qidx_node;           /* pointer to position in queue index */
-    void        *d_ofork;             /* oforks using this directory. */
-    time_t      ctime;                /* inode ctime */
+    time_t      ctime;                /* inode ctime, used and modified by reenumeration */
+    time_t      ctime_dircache;       /* inode ctime, used and modified by dircache */
     int         d_flags;              /* directory flags */
     cnid_t      d_pdid;               /* CNID of parent directory */
     cnid_t      d_did;                /* CNID of directory */