LU-6767 osd-zfs: Track readonly status of ZFS

[fs/lustre-release.git] / lustre / osd-zfs / osd_internal.h

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index 850290f..62543f8 100644 (file)
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -27,7 +27,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, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -262,7 +262,8 @@ struct osd_device {
        unsigned int             od_oi_count;
        struct osd_seq_list     od_seq_list;
 
-       unsigned int             od_rdonly:1,
+       unsigned int             od_dev_set_rdonly:1, /**< osd_ro() called */
+                                od_prop_rdonly:1,  /**< ZFS property readonly */
                                 od_xattr_in_sa:1,
                                 od_quota_iused_est:1,
                                 od_is_ost:1,
@@ -330,6 +331,7 @@ struct osd_object {
        uint64_t                 oo_xattr;
        enum osd_destroy_type    oo_destroy;
 
+       __u32                    oo_destroyed:1;
        /* record size for index file */
        unsigned char            oo_keysize;
        unsigned char            oo_recsize;
@@ -461,8 +463,6 @@ int osd_fid_lookup(const struct lu_env *env,
 uint64_t osd_get_name_n_idx(const struct lu_env *env, struct osd_device *osd,
                            const struct lu_fid *fid, char *buf);
 int osd_options_init(void);
-int osd_convert_root_to_new_seq(const struct lu_env *env,
-                               struct osd_device *o);
 int osd_ost_seq_exists(const struct lu_env *env, struct osd_device *osd,
                       __u64 seq);
 /* osd_index.c */