LU-2075 fld: use predefined FIDs

[fs/lustre-release.git] / lustre / fld / fld_index.c

diff --git a/lustre/fld/fld_index.c b/lustre/fld/fld_index.c
index e7f2a21..2a8d314 100644 (file)
--- a/lustre/fld/fld_index.c
+++ b/lustre/fld/fld_index.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +38,7 @@
  * Author: WangDi <wangdi@clusterfs.com>
  * Author: Yury Umanets <umka@clusterfs.com>
  */
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
+
 #define DEBUG_SUBSYSTEM S_FLD
 
 #ifdef __KERNEL__
@@ -76,7 +72,7 @@ static const struct lu_seq_range IGIF_FLD_RANGE = {
 };
 
 const struct dt_index_features fld_index_features = {
-        .dif_flags       = DT_IND_UPDATE,
+       .dif_flags       = DT_IND_UPDATE | DT_IND_RANGE,
         .dif_keysize_min = sizeof(seqno_t),
         .dif_keysize_max = sizeof(seqno_t),
         .dif_recsize_min = sizeof(struct lu_seq_range),
@@ -86,8 +82,7 @@ const struct dt_index_features fld_index_features = {
 
 extern struct lu_context_key fld_thread_key;
 
-static struct dt_key *fld_key(const struct lu_env *env,
-                              const seqno_t seq)
+static struct dt_key *fld_key(const struct lu_env *env, const seqno_t seq)
 {
         struct fld_thread_info *info;
         ENTRY;
@@ -154,6 +149,11 @@ int fld_declare_index_create(struct lu_server_fld *fld,
 
         ENTRY;
 
+       if (fld->lsf_no_range_lookup) {
+               /* Stub for underlying FS which can't lookup ranges */
+               return 0;
+       }
+
         start = range->lsr_start;
         LASSERT(range_is_sane(range));
 
@@ -185,6 +185,17 @@ int fld_index_create(struct lu_server_fld *fld,
 
         ENTRY;
 
+       if (fld->lsf_no_range_lookup) {
+               /* Stub for underlying FS which can't lookup ranges */
+               if (range->lsr_index != 0) {
+                       CERROR("%s: FLD backend does not support range"
+                              "lookups, so DNE and FIDs-on-OST are not"
+                              "supported in this configuration\n",
+                              fld->lsf_name);
+                       return -EINVAL;
+               }
+       }
+
         start = range->lsr_start;
         LASSERT(range_is_sane(range));
 
@@ -253,6 +264,17 @@ int fld_index_lookup(struct lu_server_fld *fld,
 
         ENTRY;
 
+       if (fld->lsf_no_range_lookup) {
+               /* Stub for underlying FS which can't lookup ranges */
+               range->lsr_start = 0;
+               range->lsr_end = ~0;
+               range->lsr_index = 0;
+               range->lsr_flags = LU_SEQ_RANGE_MDT;
+
+               range_cpu_to_be(range, range);
+               return 0;
+       }
+
         info = lu_context_key_get(&env->le_ctx, &fld_thread_key);
         fld_rec = &info->fti_rec;
 
@@ -310,10 +332,20 @@ int fld_index_init(struct lu_server_fld *fld,
 {
         struct dt_object *dt_obj;
         struct lu_fid fid;
+       struct lu_attr attr;
+       struct dt_object_format dof;
         int rc;
         ENTRY;
 
-        dt_obj = dt_store_open(env, dt, "", fld_index_name, &fid);
+       lu_local_obj_fid(&fid, FLD_INDEX_OID);
+
+       memset(&attr, 0, sizeof(attr));
+       attr.la_valid = LA_MODE;
+       attr.la_mode = S_IFREG | 0666;
+       dof.dof_type = DFT_INDEX;
+       dof.u.dof_idx.di_feat = &fld_index_features;
+
+       dt_obj = dt_find_or_create(env, dt, &fid, &dof, &attr);
         if (!IS_ERR(dt_obj)) {
                 fld->lsf_obj = dt_obj;
                 rc = dt_obj->do_ops->do_index_try(env, dt_obj,
@@ -327,9 +359,21 @@ int fld_index_init(struct lu_server_fld *fld,
                                 lu_object_put(env, &dt_obj->do_lu);
                                 fld->lsf_obj = NULL;
                         }
-                } else
-                        CERROR("%s: File \"%s\" is not an index!\n",
-                               fld->lsf_name, fld_index_name);
+               } else if (rc == -ERANGE) {
+                       CWARN("%s: File \"%s\" doesn't support range lookup, "
+                             "using stub. DNE and FIDs on OST will not work "
+                             "with this backend\n",
+                             fld->lsf_name, fld_index_name);
+
+                       LASSERT(dt_obj->do_index_ops == NULL);
+                       fld->lsf_no_range_lookup = 1;
+                       rc = 0;
+               } else {
+                       CERROR("%s: File \"%s\" is not index, rc %d!\n",
+                              fld->lsf_name, fld_index_name, rc);
+                       lu_object_put(env, &fld->lsf_obj->do_lu);
+                       fld->lsf_obj = NULL;
+               }
 
 
         } else {