LU-2449 osd: osd-zfs to handle ./.. properly

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

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index d3025b7..44de8d7 100644 (file)
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -28,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2011, 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  */
 /*
@@ -47,7 +47,7 @@
 #define _OSD_INTERNAL_H
 
 #include <dt_object.h>
-#include <lquota.h>
+#include <lustre_quota.h>
 #include <sys/arc.h>
 
 #include <sys/nvpair.h>
@@ -76,12 +76,22 @@ struct osd_it_quota {
 
 /**
  * Iterator's in-memory data structure for ZAPs
+ *
+ * ZFS does not store . and .. on a disk, instead they are
+ * generated up on request
+ * to follow this format we do the same
  */
 struct osd_zap_it {
        zap_cursor_t            *ozi_zc;
        struct osd_object       *ozi_obj;
        struct lustre_capa      *ozi_capa;
-       unsigned                 ozi_reset:1;     /* 1 -- no need to advance */
+       unsigned                 ozi_reset:1;   /* 1 -- no need to advance */
+       /* ozi_pos - position of the cursor:
+        * 0 - before any record
+        * 1 - "."
+        * 2 - ".."
+        * 3 - real records */
+       unsigned                 ozi_pos:3;
        union {
                char             ozi_name[NAME_MAX + 1]; /* file name for dir */
                __u64            ozi_key; /* binary key for index files */
@@ -156,6 +166,7 @@ struct osd_thread_info {
        struct luz_direntry      oti_zde;
 
        struct lquota_id_info    oti_qi;
+       struct lu_seq_range      oti_seq_range;
 };
 
 extern struct lu_context_key osd_key;
@@ -169,7 +180,7 @@ struct osd_thandle {
        struct thandle           ot_super;
        cfs_list_t               ot_dcb_list;
        cfs_list_t               ot_sa_list;
-       cfs_semaphore_t          ot_sa_lock;
+       struct semaphore         ot_sa_lock;
        dmu_tx_t                *ot_tx;
        struct lquota_trans      ot_quota_trans;
        __u32                    ot_write_commit:1,
@@ -186,6 +197,19 @@ struct osd_oi {
        uint64_t                oi_zapid;
 };
 
+struct osd_seq {
+       uint64_t         *os_compat_dirs;
+       int              os_subdir_count; /* subdir count for each seq */
+       obd_seq          os_seq;          /* seq number */
+       cfs_list_t       os_seq_list;     /* list to seq_list */
+};
+
+struct osd_seq_list {
+       rwlock_t         osl_seq_list_lock;     /* lock for seq_list */
+       cfs_list_t       osl_seq_list;      /* list head for seq */
+       struct semaphore osl_seq_init_sem;
+};
+
 #define OSD_OST_MAP_SIZE       32
 
 /*
@@ -212,8 +236,8 @@ struct osd_device {
        uint64_t                 od_root;
        struct osd_oi           **od_oi_table;
        unsigned int             od_oi_count;
-       uint64_t                 od_ost_compat_dirs[OSD_OST_MAP_SIZE];
-       uint64_t                 od_ost_compat_grp0;
+       uint64_t                od_ost_compat_grp0;
+       struct osd_seq_list     od_seq_list;
 
        unsigned int             od_rdonly:1,
                                 od_xattr_in_sa:1,
@@ -255,14 +279,14 @@ struct osd_object {
        nvlist_t                *oo_sa_xattr;
        cfs_list_t               oo_sa_linkage;
 
-       cfs_rw_semaphore_t       oo_sem;
+       struct rw_semaphore      oo_sem;
 
        /* cached attributes */
-       cfs_rwlock_t             oo_attr_lock;
+       rwlock_t                 oo_attr_lock;
        struct lu_attr           oo_attr;
 
        /* protects extended attributes */
-       cfs_semaphore_t          oo_guard;
+       struct semaphore         oo_guard;
        uint64_t                 oo_xattr;
 
        /* record size for index file */
@@ -334,6 +358,15 @@ static inline int osd_object_invariant(const struct lu_object *l)
        return osd_invariant(osd_obj(l));
 }
 
+static inline struct seq_server_site *osd_seq_site(struct osd_device *osd)
+{
+       return osd->od_dt_dev.dd_lu_dev.ld_site->ld_seq_site;
+}
+
+static inline char *osd_name(struct osd_device *osd)
+{
+       return osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name;
+}
 
 #ifdef LPROCFS
 enum {