LU-6068 misc: update Intel copyright messages 2014

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

diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c
index 41ce2c1..0618087 100644 (file)
--- a/lustre/target/tgt_handler.c
+++ b/lustre/target/tgt_handler.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * lustre/target/tgt_handler.c
@@ -134,8 +134,8 @@ static int tgt_mdt_body_unpack(struct tgt_session_info *tsi, __u32 flags)
 int tgt_validate_obdo(struct tgt_session_info *tsi, struct obdo *oa)
 {
        struct ost_id   *oi     = &oa->o_oi;
-       obd_seq          seq    = ostid_seq(oi);
-       obd_id           id     = ostid_id(oi);
+       u64              seq    = ostid_seq(oi);
+       u64              id     = ostid_id(oi);
        int              rc;
        ENTRY;
 
@@ -475,6 +475,7 @@ static int tgt_filter_recovery_request(struct ptlrpc_request *req,
        case OUT_UPDATE:
        case SEQ_QUERY:
        case FLD_QUERY:
+       case FLD_READ:
        case LDLM_ENQUEUE:
        case OST_CREATE:
        case OST_DESTROY:
@@ -498,7 +499,7 @@ static int tgt_filter_recovery_request(struct ptlrpc_request *req,
  *       -ve: abort immediately with the given error code;
  *         0: send reply with error code in req->rq_status;
  */
-int tgt_handle_recovery(struct ptlrpc_request *req, int reply_fail_id)
+static int tgt_handle_recovery(struct ptlrpc_request *req, int reply_fail_id)
 {
        ENTRY;
 
@@ -1045,7 +1046,7 @@ EXPORT_SYMBOL(tgt_sendpage);
 /*
  * OBD_IDX_READ handler
  */
-int tgt_obd_idx_read(struct tgt_session_info *tsi)
+static int tgt_obd_idx_read(struct tgt_session_info *tsi)
 {
        struct tgt_thread_info  *tti = tgt_th_info(tsi->tsi_env);
        struct lu_rdpg          *rdpg = &tti->tti_u.rdpg.tti_rdpg;
@@ -1160,8 +1161,8 @@ EXPORT_SYMBOL(tgt_sync);
 
 /* Ensure that data and metadata are synced to the disk when lock is cancelled
  * (if requested) */
-int tgt_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
-                    void *data, int flag)
+static int tgt_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
+                           void *data, int flag)
 {
        struct lu_env            env;
        struct lu_target        *tgt;
@@ -1217,7 +1218,7 @@ err_env:
        RETURN(rc);
 }
 
-struct ldlm_callback_suite tgt_dlm_cbs = {
+static struct ldlm_callback_suite tgt_dlm_cbs = {
        .lcs_completion = ldlm_server_completion_ast,
        .lcs_blocking   = tgt_blocking_ast,
        .lcs_glimpse    = ldlm_server_glimpse_ast
@@ -1370,7 +1371,7 @@ EXPORT_SYMBOL(tgt_llog_handlers);
  * sec context handlers
  */
 /* XXX: Implement based on mdt_sec_ctx_handle()? */
-int tgt_sec_ctx_handle(struct tgt_session_info *tsi)
+static int tgt_sec_ctx_handle(struct tgt_session_info *tsi)
 {
        return 0;
 }
@@ -1846,7 +1847,7 @@ EXPORT_SYMBOL(tgt_brw_read);
 static void tgt_warn_on_cksum(struct ptlrpc_request *req,
                              struct ptlrpc_bulk_desc *desc,
                              struct niobuf_local *local_nb, int npages,
-                             obd_count client_cksum, obd_count server_cksum,
+                             u32 client_cksum, u32 server_cksum,
                              bool mmap)
 {
        struct obd_export *exp = req->rq_export;