LU-2154 osp: precreate logic to use last assigned id

[fs/lustre-release.git] / lustre / osp / osp_dev.c

diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c
index c9d9639..5fcca70 100644 (file)
--- a/lustre/osp/osp_dev.c
+++ b/lustre/osp/osp_dev.c
@@ -319,19 +319,8 @@ static int osp_statfs(const struct lu_env *env, struct dt_device *dev,
 
        ENTRY;
 
-       if (unlikely(d->opd_imp_active == 0)) {
-               /*
-                * in case of inactive OST we return nulls
-                * so that caller can understand this device
-                * is unusable for new objects
-                *
-                * XXX: shouldn't we take normal statfs and fill
-                * just few specific fields with zeroes?
-                */
-               memset(sfs, 0, sizeof(*sfs));
-               sfs->os_bsize = 4096;
-               RETURN(0);
-       }
+       if (unlikely(d->opd_imp_active == 0))
+               RETURN(-ENOTCONN);
 
        /* return recently updated data */
        *sfs = d->opd_statfs;
@@ -341,9 +330,12 @@ static int osp_statfs(const struct lu_env *env, struct dt_device *dev,
         * how many objects are available for immediate creation
         */
        cfs_spin_lock(&d->opd_pre_lock);
-       sfs->os_ffree = d->opd_pre_last_created - d->opd_pre_next;
+       sfs->os_fprecreated = d->opd_pre_last_created - d->opd_pre_used_id;
+       sfs->os_fprecreated -= d->opd_pre_reserved;
        cfs_spin_unlock(&d->opd_pre_lock);
 
+       LASSERT(sfs->os_fprecreated <= OST_MAX_PRECREATE);
+
        CDEBUG(D_OTHER, "%s: "LPU64" blocks, "LPU64" free, "LPU64" avail, "
               LPU64" files, "LPU64" free files\n", d->opd_obd->obd_name,
               sfs->os_blocks, sfs->os_bfree, sfs->os_bavail,