X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_handler.c;h=cf8b64d40648ce391a67563ac2d4c7577daf4378;hp=67144360ae6feaf4dddd6f7ad8e0779f1ab5f8b3;hb=68635c3d9b3113621b93fd989f1a3f8f064385b9;hpb=20472b4070495c1bb2796ce2682aefdf2fe8a3f6 diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c index 6714436..cf8b64d 100644 --- a/lustre/osd-ldiskfs/osd_handler.c +++ b/lustre/osd-ldiskfs/osd_handler.c @@ -2198,6 +2198,9 @@ int osd_statfs(const struct lu_env *env, struct dt_device *d, statfs_pack(sfs, ksfs); if (unlikely(sb->s_flags & MS_RDONLY)) sfs->os_state |= OS_STATE_READONLY; + + sfs->os_state |= osd->od_nonrotational ? OS_STATE_NONROT : 0; + if (ldiskfs_has_feature_extents(sb)) sfs->os_maxbytes = sb->s_maxbytes; else @@ -7757,6 +7760,7 @@ static int osd_device_init0(const struct lu_env *env, o->od_read_cache = 1; o->od_writethrough_cache = 1; o->od_readcache_max_filesize = OSD_MAX_CACHE_SIZE; + o->od_auto_scrub_interval = AS_DEFAULT; cplen = strlcpy(o->od_svname, lustre_cfg_string(cfg, 4), @@ -7778,6 +7782,10 @@ static int osd_device_init0(const struct lu_env *env, if (rc != 0) GOTO(out, rc); + /* Can only check block device after mount */ + o->od_nonrotational = + blk_queue_nonrot(bdev_get_queue(osd_sb(o)->s_bdev)); + rc = osd_obj_map_init(env, o); if (rc != 0) GOTO(out_mnt, rc);