b=17670

[fs/lustre-release.git] / lustre / osd / osd_internal.h

diff --git a/lustre/osd/osd_internal.h b/lustre/osd/osd_internal.h
index 8fd25f2..624b82a 100644 (file)
--- a/lustre/osd/osd_internal.h
+++ b/lustre/osd/osd_internal.h
@@ -128,6 +128,16 @@ struct osd_device {
         __u32                     od_iop_mode;
 };
 
+struct osd_it_ea_dirent {
+        __u64           oied_ino;
+        __u64           oied_off;
+        unsigned short  oied_namelen;
+        unsigned int    oied_type;
+        char            oied_name[0];
+} __attribute__((packed));
+
+#define OSD_IT_EA_BUFSIZE       CFS_PAGE_SIZE
+
 /**
  * This is iterator's in-memory data structure in interoperability
  * mode (i.e. iterator over ldiskfs style directory)
@@ -136,15 +146,18 @@ struct osd_it_ea {
         struct osd_object   *oie_obj;
         /** used in ldiskfs iterator, to stored file pointer */
         struct file          oie_file;
-        /** used in ldiskfs iterator, to store directory entry */
-        struct dirent64      oie_dirent64;
         /** current file position */
-        __u64               oie_curr_pos;
+        __u64                oie_curr_pos;
         /** next file position */
-        __u64               oie_next_pos;
-        /** namelen of the file */
-        __u8                oie_namelen;
-
+        __u64                oie_next_pos;
+        /** how many entries have been read-cached from storage */
+        int                  oie_rd_dirent;
+        /** current entry is being iterated by caller */
+        int                  oie_it_dirent;
+        /** current processing entry */
+        struct osd_it_ea_dirent *oie_dirent;
+        /** buffer to hold entries, size == OSD_IT_EA_BUFSIZE */
+        void                *oie_buf;
 };
 
 /**
@@ -173,10 +186,8 @@ struct osd_thread_info {
          * XXX temporary: for ->i_op calls.
          */
         struct txn_param       oti_txn;
-        /*
-         * XXX temporary: fake dentry used by xattr calls.
-         */
         struct timespec        oti_time;
+        struct timespec        oti_time2;
         /*
          * XXX temporary: fake struct file for osd_object_sync
          */
@@ -203,6 +214,8 @@ struct osd_thread_info {
                 struct osd_it_ea       oti_it_ea;
         };
 
+        /** pre-allocated buffer used by oti_it_ea, size OSD_IT_EA_BUFSIZE */
+        void                  *oti_it_ea_buf;
 
         /** IAM iterator for index operation. */
         struct iam_iterator    oti_idx_it;
@@ -229,6 +242,7 @@ struct osd_thread_info {
 #ifdef HAVE_QUOTA_SUPPORT
         struct osd_ctxt        oti_ctxt;
 #endif
+        struct lu_env          oti_obj_delete_tx_env;
 };
 
 #ifdef LPROCFS