LU-7064 obd: detect errors from llog_declare_destroy()

[fs/lustre-release.git] / lustre / ptlrpc / nrs_orr.c

diff --git a/lustre/ptlrpc/nrs_orr.c b/lustre/ptlrpc/nrs_orr.c
index 982fafa..b22a651 100644 (file)
--- a/lustre/ptlrpc/nrs_orr.c
+++ b/lustre/ptlrpc/nrs_orr.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2015, Intel Corporation.
  *
  * Copyright 2012 Xyratex Technology Limited
  */
@@ -154,6 +154,10 @@ static int nrs_orr_key_fill(struct nrs_orr_data *orrd,
                return 0;
        }
 
+       /* Bounce unconnected requests to the default policy. */
+       if (req->rq_export == NULL)
+               return -ENOTCONN;
+
        if (nrq->nr_u.orr.or_orr_set || nrq->nr_u.orr.or_trr_set)
                memset(&nrq->nr_u.orr.or_key, 0, sizeof(nrq->nr_u.orr.or_key));
 
@@ -228,18 +232,18 @@ static int nrs_orr_range_fill_physical(struct ptlrpc_nrs_request *nrq,
        struct ptlrpc_request     *req = container_of(nrq,
                                                      struct ptlrpc_request,
                                                      rq_nrq);
-       char                       fiemap_buf[offsetof(struct ll_user_fiemap,
+       char                       fiemap_buf[offsetof(struct fiemap,
                                                  fm_extents[ORR_NUM_EXTENTS])];
-       struct ll_user_fiemap     *fiemap = (struct ll_user_fiemap *)fiemap_buf;
+       struct fiemap              *fiemap = (struct fiemap *)fiemap_buf;
        struct ll_fiemap_info_key  key;
        loff_t                     start;
        loff_t                     end;
        int                        rc;
 
        key = (typeof(key)) {
-               .name = KEY_FIEMAP,
-               .oa = *oa,
-               .fiemap = {
+               .lfik_name = KEY_FIEMAP,
+               .lfik_oa = *oa,
+               .lfik_fiemap = {
                        .fm_start = range->or_start,
                        .fm_length = range->or_end - range->or_start,
                        .fm_extent_count = ORR_NUM_EXTENTS
@@ -384,7 +388,8 @@ static void nrs_orr_genobjname(struct ptlrpc_nrs_policy *policy, char *name)
 #define NRS_TRR_BKT_BITS       2
 #define NRS_TRR_HASH_FLAGS     CFS_HASH_SPIN_BKTLOCK
 
-static unsigned nrs_orr_hop_hash(cfs_hash_t *hs, const void *key, unsigned mask)
+static unsigned
+nrs_orr_hop_hash(struct cfs_hash *hs, const void *key, unsigned mask)
 {
        return cfs_hash_djb2_hash(key, sizeof(struct nrs_orr_key), mask);
 }
@@ -412,7 +417,7 @@ static void *nrs_orr_hop_object(struct hlist_node *hnode)
        return hlist_entry(hnode, struct nrs_orr_object, oo_hnode);
 }
 
-static void nrs_orr_hop_get(cfs_hash_t *hs, struct hlist_node *hnode)
+static void nrs_orr_hop_get(struct cfs_hash *hs, struct hlist_node *hnode)
 {
        struct nrs_orr_object *orro = hlist_entry(hnode,
                                                      struct nrs_orr_object,
@@ -424,14 +429,14 @@ static void nrs_orr_hop_get(cfs_hash_t *hs, struct hlist_node *hnode)
  * Removes an nrs_orr_object the hash and frees its memory, if the object has
  * no active users.
  */
-static void nrs_orr_hop_put_free(cfs_hash_t *hs, struct hlist_node *hnode)
+static void nrs_orr_hop_put_free(struct cfs_hash *hs, struct hlist_node *hnode)
 {
        struct nrs_orr_object *orro = hlist_entry(hnode,
                                                      struct nrs_orr_object,
                                                      oo_hnode);
        struct nrs_orr_data   *orrd = container_of(orro->oo_res.res_parent,
                                                   struct nrs_orr_data, od_res);
-       cfs_hash_bd_t          bd;
+       struct cfs_hash_bd     bd;
 
        cfs_hash_bd_get_and_lock(hs, &orro->oo_key, &bd, 1);
 
@@ -448,7 +453,7 @@ static void nrs_orr_hop_put_free(cfs_hash_t *hs, struct hlist_node *hnode)
        OBD_SLAB_FREE_PTR(orro, orrd->od_cache);
 }
 
-static void nrs_orr_hop_put(cfs_hash_t *hs, struct hlist_node *hnode)
+static void nrs_orr_hop_put(struct cfs_hash *hs, struct hlist_node *hnode)
 {
        struct nrs_orr_object *orro = hlist_entry(hnode,
                                                      struct nrs_orr_object,
@@ -465,7 +470,7 @@ static int nrs_trr_hop_keycmp(const void *key, struct hlist_node *hnode)
        return orro->oo_key.ok_idx == ((struct nrs_orr_key *)key)->ok_idx;
 }
 
-static void nrs_trr_hop_exit(cfs_hash_t *hs, struct hlist_node *hnode)
+static void nrs_trr_hop_exit(struct cfs_hash *hs, struct hlist_node *hnode)
 {
        struct nrs_orr_object *orro = hlist_entry(hnode,
                                                      struct nrs_orr_object,
@@ -480,7 +485,7 @@ static void nrs_trr_hop_exit(cfs_hash_t *hs, struct hlist_node *hnode)
        OBD_SLAB_FREE_PTR(orro, orrd->od_cache);
 }
 
-static cfs_hash_ops_t nrs_orr_hash_ops = {
+static struct cfs_hash_ops nrs_orr_hash_ops = {
        .hs_hash        = nrs_orr_hop_hash,
        .hs_key         = nrs_orr_hop_key,
        .hs_keycmp      = nrs_orr_hop_keycmp,
@@ -490,7 +495,7 @@ static cfs_hash_ops_t nrs_orr_hash_ops = {
        .hs_put_locked  = nrs_orr_hop_put,
 };
 
-static cfs_hash_ops_t nrs_trr_hash_ops = {
+static struct cfs_hash_ops nrs_trr_hash_ops = {
        .hs_hash        = nrs_orr_hop_hash,
        .hs_key         = nrs_orr_hop_key,
        .hs_keycmp      = nrs_trr_hop_keycmp,
@@ -519,7 +524,8 @@ static cfs_hash_ops_t nrs_trr_hash_ops = {
  * \retval 0 e1 > e2
  * \retval 1 e1 < e2
  */
-static int orr_req_compare(cfs_binheap_node_t *e1, cfs_binheap_node_t *e2)
+static int
+orr_req_compare(struct cfs_binheap_node *e1, struct cfs_binheap_node *e2)
 {
        struct ptlrpc_nrs_request *nrq1;
        struct ptlrpc_nrs_request *nrq2;
@@ -574,7 +580,7 @@ static int orr_req_compare(cfs_binheap_node_t *e1, cfs_binheap_node_t *e2)
 /**
  * ORR binary heap operations
  */
-static cfs_binheap_ops_t nrs_orr_heap_ops = {
+static struct cfs_binheap_ops nrs_orr_heap_ops = {
        .hop_enter      = NULL,
        .hop_exit       = NULL,
        .hop_compare    = orr_req_compare,
@@ -612,7 +618,7 @@ static int nrs_orr_init(struct ptlrpc_nrs_policy *policy)
 static int nrs_orr_start(struct ptlrpc_nrs_policy *policy, char *arg)
 {
        struct nrs_orr_data    *orrd;
-       cfs_hash_ops_t         *ops;
+       struct cfs_hash_ops            *ops;
        unsigned                cur_bits;
        unsigned                max_bits;
        unsigned                bkt_bits;
@@ -688,10 +694,8 @@ static int nrs_orr_start(struct ptlrpc_nrs_policy *policy, char *arg)
        RETURN(rc);
 
 failed:
-       if (orrd->od_cache) {
+       if (orrd->od_cache)
                kmem_cache_destroy(orrd->od_cache);
-               LASSERTF(rc == 0, "Could not destroy od_cache slab\n");
-       }
        if (orrd->od_binheap != NULL)
                cfs_binheap_destroy(orrd->od_binheap);
 
@@ -941,7 +945,7 @@ struct ptlrpc_nrs_request *nrs_orr_req_get(struct ptlrpc_nrs_policy *policy,
                                           bool peek, bool force)
 {
        struct nrs_orr_data       *orrd = policy->pol_private;
-       cfs_binheap_node_t        *node = cfs_binheap_root(orrd->od_binheap);
+       struct cfs_binheap_node   *node = cfs_binheap_root(orrd->od_binheap);
        struct ptlrpc_nrs_request *nrq;
 
        nrq = unlikely(node == NULL) ? NULL :
@@ -1116,7 +1120,7 @@ static void nrs_orr_req_del(struct ptlrpc_nrs_policy *policy,
         */
        if (unlikely(is_root)) {
                /** Peek at the next request to be served */
-               cfs_binheap_node_t *node = cfs_binheap_root(orrd->od_binheap);
+               struct cfs_binheap_node *node = cfs_binheap_root(orrd->od_binheap);
 
                /** No more requests */
                if (unlikely(node == NULL)) {
@@ -1274,7 +1278,8 @@ no_hp:
  * almost identical; it can be reworked and then reused for ORR/TRR.
  */
 static ssize_t
-ptlrpc_lprocfs_nrs_orr_quantum_seq_write(struct file *file, const char *buffer,
+ptlrpc_lprocfs_nrs_orr_quantum_seq_write(struct file *file,
+                                        const char __user *buffer,
                                         size_t count, loff_t *off)
 {
        struct seq_file             *m = file->private_data;
@@ -1488,7 +1493,8 @@ no_hp:
  */
 static ssize_t
 ptlrpc_lprocfs_nrs_orr_offset_type_seq_write(struct file *file,
-                                            const char *buffer, size_t count,
+                                            const char __user *buffer,
+                                             size_t count,
                                             loff_t *off)
 {
        struct seq_file             *m = file->private_data;
@@ -1747,7 +1753,8 @@ no_hp:
  */
 static ssize_t
 ptlrpc_lprocfs_nrs_orr_supported_seq_write(struct file *file,
-                                          const char *buffer, size_t count,
+                                          const char __user *buffer,
+                                          size_t count,
                                           loff_t *off)
 {
        struct seq_file             *m = file->private_data;