LU-9816 kernel: kernel upgrade RHEL7.4 [3.10.0-693.el7]

[fs/lustre-release.git] / lustre / target / out_handler.c

diff --git a/lustre/target/out_handler.c b/lustre/target/out_handler.c
index d9ba4dc..8e761c1 100644 (file)
--- a/lustre/target/out_handler.c
+++ b/lustre/target/out_handler.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2016, Intel Corporation.
  *
  * lustre/target/out_handler.c
  *
@@ -90,13 +90,12 @@ static inline int out_check_resent(const struct lu_env *env,
                lustre_msg_set_transno(req->rq_repmsg, req->rq_transno);
                lustre_msg_set_status(req->rq_repmsg, req->rq_status);
 
-               DEBUG_REQ(D_RPCTRACE, req, "restoring transno "LPD64"status %d",
-                         req->rq_transno, req->rq_status);
+               DEBUG_REQ(D_RPCTRACE, req, "restoring resent RPC");
 
                reconstruct(env, dt, obj, reply, index);
                return 1;
        }
-       DEBUG_REQ(D_HA, req, "no reply for RESENT req (have "LPD64")",
+       DEBUG_REQ(D_HA, req, "no reply for RESENT req (have %lld)",
                 req->rq_export->exp_target_data.ted_lcd->lcd_last_xid);
        return 0;
 }
@@ -225,7 +224,6 @@ static int out_attr_get(struct tgt_session_info *tsi)
 
        obdo->o_valid = 0;
        obdo_from_la(obdo, la, la->la_valid);
-       lustre_set_wire_obdo(NULL, obdo, obdo);
 
 out_unlock:
        dt_read_unlock(env, obj);
@@ -276,21 +274,26 @@ static int out_xattr_get(struct tgt_session_info *tsi)
        }
 
        lbuf->lb_len = (int)tti->tti_u.update.tti_update->ou_result_size;
-       lbuf->lb_buf = update_result->our_data;
        if (lbuf->lb_len == 0)
-               lbuf->lb_buf = 0;
+               lbuf->lb_buf = NULL;
+       else
+               lbuf->lb_buf = update_result->our_data;
+
        dt_read_lock(env, obj, MOR_TGT_CHILD);
        rc = dt_xattr_get(env, obj, lbuf, name);
        dt_read_unlock(env, obj);
-       if (rc < 0)
+       if (rc <= 0) {
                lbuf->lb_len = 0;
-       CDEBUG(D_INFO, "%s: "DFID" get xattr %s len %d\n",
-              tgt_name(tsi->tsi_tgt), PFID(lu_object_fid(&obj->do_lu)),
-              name, (int)lbuf->lb_len);
+               if (unlikely(!rc))
+                       rc = -ENODATA;
+       } else if (lbuf->lb_buf) {
+               lbuf->lb_len = rc;
+       }
 
-       GOTO(out, rc);
+       CDEBUG(D_INFO, "%s: "DFID" get xattr %s len %d: rc = %d\n",
+              tgt_name(tsi->tsi_tgt), PFID(lu_object_fid(&obj->do_lu)),
+              name, (int)lbuf->lb_len, rc);
 
-out:
        object_update_result_insert(reply, lbuf->lb_buf, lbuf->lb_len, idx, rc);
        RETURN(0);
 }
@@ -806,17 +809,7 @@ static int out_trans_stop(const struct lu_env *env,
        rc = dt_trans_stop(env, ta->ta_handle->th_dev, ta->ta_handle);
        for (i = 0; i < ta->ta_argno; i++) {
                if (ta->ta_args[i]->object != NULL) {
-                       struct dt_object *obj = ta->ta_args[i]->object;
-
-                       /* If the object is being created during this
-                        * transaction, we need to remove them from the
-                        * cache immediately, because a few layers are
-                        * missing in OUT handler, i.e. the object might
-                        * not be initialized in all layers */
-                       if (ta->ta_args[i]->exec_fn == out_tx_create_exec)
-                               set_bit(LU_OBJECT_HEARD_BANSHEE,
-                                       &obj->do_lu.lo_header->loh_flags);
-                       lu_object_put(env, &ta->ta_args[i]->object->do_lu);
+                       dt_object_put(env, ta->ta_args[i]->object);
                        ta->ta_args[i]->object = NULL;
                }
        }
@@ -1083,12 +1076,13 @@ int out_handle(struct tgt_session_info *tsi)
                                GOTO(out, rc = PTR_ERR(dt_obj));
 
                        if (dt->dd_record_fid_accessed) {
-                               lfsck_pack_rfa(&tti->tti_lr,
+                               struct lfsck_req_local *lrl = &tti->tti_lrl;
+
+                               lfsck_pack_rfa(lrl,
                                               lu_object_fid(&dt_obj->do_lu),
-                                              LE_FID_ACCESSED,
+                                              LEL_FID_ACCESSED,
                                               LFSCK_TYPE_LAYOUT);
-                               tgt_lfsck_in_notify(env, dt, &tti->tti_lr,
-                                                   NULL);
+                               tgt_lfsck_in_notify_local(env, dt, lrl, NULL);
                        }
 
                        tti->tti_u.update.tti_dt_object = dt_obj;
@@ -1110,6 +1104,9 @@ int out_handle(struct tgt_session_info *tsi)
                                                     out_reconstruct, reply,
                                                     reply_index))
                                        GOTO(next, rc = 0);
+
+                               if (dt->dd_rdonly)
+                                       GOTO(next, rc = -EROFS);
                        }
 
                        /* start transaction for modification RPC only */
@@ -1148,7 +1145,7 @@ int out_handle(struct tgt_session_info *tsi)
                        rc = h->th_act(tsi);
 next:
                        reply_index++;
-                       lu_object_put(env, &dt_obj->do_lu);
+                       dt_object_put(env, dt_obj);
                        if (rc < 0)
                                GOTO(out, rc);
                }