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

[fs/lustre-release.git] / lustre / osd-zfs / osd_handler.c

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index c73184e..4f78957 100644 (file)
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -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/
@@ -502,11 +502,9 @@ static int osd_objset_statfs(struct osd_device *osd, struct obd_statfs *osfs)
        osfs->os_namelen = MAXNAMELEN;
        osfs->os_maxbytes = OBD_OBJECT_EOF;
 
-       /* ZFS XXX: fill in appropriate OS_STATE_{DEGRADED,READONLY} flags
-          osfs->os_state = vf_to_stf(vfsp->vfs_flag);
-          if (sb->s_flags & MS_RDONLY)
-          osfs->os_state |= OS_STATE_READONLY;
-        */
+       if (!spa_writeable(dmu_objset_spa(os)) ||
+           osd->od_dev_set_rdonly || osd->od_prop_rdonly)
+               osfs->os_state |= OS_STATE_READONLY;
 
        return 0;
 }
@@ -631,7 +629,7 @@ static int osd_ro(const struct lu_env *env, struct dt_device *d)
 
        CERROR("%s: *** setting device %s read-only ***\n",
               osd->od_svname, LUSTRE_OSD_ZFS_NAME);
-       osd->od_rdonly = 1;
+       osd->od_dev_set_rdonly = 1;
        spa_freeze(dmu_objset_spa(osd->od_os));
 
        RETURN(0);
@@ -743,6 +741,13 @@ static void osd_recordsize_changed_cb(void *arg, uint64_t newval)
        osd->od_max_blksz = newval;
 }
 
+static void osd_readonly_changed_cb(void *arg, uint64_t newval)
+{
+       struct osd_device *osd = arg;
+
+       osd->od_prop_rdonly = !!newval;
+}
+
 /*
  * This function unregisters all registered callbacks.  It's harmless to
  * unregister callbacks that were never registered so it is used to safely
@@ -756,6 +761,8 @@ static void osd_objset_unregister_callbacks(struct osd_device *o)
                                   osd_xattr_changed_cb, o);
        (void) dsl_prop_unregister(ds, zfs_prop_to_name(ZFS_PROP_RECORDSIZE),
                                   osd_recordsize_changed_cb, o);
+       (void) dsl_prop_unregister(ds, zfs_prop_to_name(ZFS_PROP_READONLY),
+                                  osd_readonly_changed_cb, o);
 
        if (o->arc_prune_cb != NULL) {
                arc_remove_prune_callback(o->arc_prune_cb);
@@ -787,6 +794,11 @@ static int osd_objset_register_callbacks(struct osd_device *o)
        if (rc)
                GOTO(err, rc);
 
+       rc = -dsl_prop_register(ds, zfs_prop_to_name(ZFS_PROP_READONLY),
+                               osd_readonly_changed_cb, o);
+       if (rc)
+               GOTO(err, rc);
+
        o->arc_prune_cb = arc_add_prune_callback(arc_prune_func, o);
 err:
        dsl_pool_config_exit(dp, FTAG);
@@ -991,10 +1003,6 @@ static int osd_mount(const struct lu_env *env,
        if (rc)
                GOTO(err, rc);
 
-       rc = osd_convert_root_to_new_seq(env, o);
-       if (rc)
-               GOTO(err, rc);
-
        /* Use our own ZAP for inode accounting by default, this can be changed
         * via procfs to estimate the inode usage from the block usage */
        o->od_quota_iused_est = 0;
@@ -1360,7 +1368,7 @@ static struct obd_ops osd_obd_device_ops = {
        .o_fid_alloc    = osd_fid_alloc
 };
 
-int __init osd_init(void)
+static int __init osd_init(void)
 {
        int rc;
 
@@ -1379,7 +1387,7 @@ int __init osd_init(void)
        return rc;
 }
 
-void __exit osd_exit(void)
+static void __exit osd_exit(void)
 {
        class_unregister_type(LUSTRE_OSD_ZFS_NAME);
        lu_kmem_fini(osd_caches);
@@ -1390,7 +1398,7 @@ CFS_MODULE_PARM(osd_oi_count, "i", int, 0444,
                "Number of Object Index containers to be created, "
                "it's only valid for new filesystem.");
 
-MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Lustre Object Storage Device ("LUSTRE_OSD_ZFS_NAME")");
 MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");