LU-9276 kernel: kernel update [SLES12 SP1 3.12.69-60.64.35]

[fs/lustre-release.git] / lustre / ofd / ofd_fs.c

diff --git a/lustre/ofd/ofd_fs.c b/lustre/ofd/ofd_fs.c
index f2981c2..25e59c2 100644 (file)
--- a/lustre/ofd/ofd_fs.c
+++ b/lustre/ofd/ofd_fs.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014 Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -111,7 +111,7 @@ void ofd_seq_put(const struct lu_env *env, struct ofd_seq *oseq)
        if (atomic_dec_and_test(&oseq->os_refc)) {
                LASSERT(list_empty(&oseq->os_list));
                LASSERT(oseq->os_lastid_obj != NULL);
-               lu_object_put(env, &oseq->os_lastid_obj->do_lu);
+               dt_object_put(env, oseq->os_lastid_obj);
                OBD_FREE_PTR(oseq);
        }
 }
@@ -212,6 +212,9 @@ int ofd_seq_last_oid_write(const struct lu_env *env, struct ofd_device *ofd,
 
        ENTRY;
 
+       if (ofd->ofd_osd->dd_rdonly)
+               RETURN(0);
+
        tmp = cpu_to_le64(ofd_seq_last_oid(oseq));
 
        info->fti_buf.lb_buf = &tmp;
@@ -677,7 +680,7 @@ void ofd_fs_cleanup(const struct lu_env *env, struct ofd_device *ofd)
                      ofd_name(ofd), rc);
 
        if (ofd->ofd_health_check_file) {
-               lu_object_put(env, &ofd->ofd_health_check_file->do_lu);
+               dt_object_put(env, ofd->ofd_health_check_file);
                ofd->ofd_health_check_file = NULL;
        }