Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-2728 fld: check for NULL param in fldb_seq_stop()
[fs/lustre-release.git] / lustre / fld / lproc_fld.c
diff --git a/lustre/fld/lproc_fld.c b/lustre/fld/lproc_fld.c
index 7b784eb..52d517f 100644 (file)
--- a/lustre/fld/lproc_fld.c
+++ b/lustre/fld/lproc_fld.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -70,9 +70,9 @@ fld_proc_read_targets(char *page, char **start, off_t off,
        int total = 0, rc;
        ENTRY;
 
-        LASSERT(fld != NULL);
+       LASSERT(fld != NULL);
 
-        cfs_spin_lock(&fld->lcf_lock);
+       spin_lock(&fld->lcf_lock);
         cfs_list_for_each_entry(target,
                                 &fld->lcf_targets, ft_chain)
         {
@@ -84,7 +84,7 @@ fld_proc_read_targets(char *page, char **start, off_t off,
                 if (count == 0)
                         break;
         }
-        cfs_spin_unlock(&fld->lcf_lock);
+       spin_unlock(&fld->lcf_lock);
        RETURN(total);
 }
 
@@ -96,12 +96,11 @@ fld_proc_read_hash(char *page, char **start, off_t off,
        int rc;
        ENTRY;
 
-        LASSERT(fld != NULL);
+       LASSERT(fld != NULL);
 
-        cfs_spin_lock(&fld->lcf_lock);
-        rc = snprintf(page, count, "%s\n",
-                      fld->lcf_hash->fh_name);
-        cfs_spin_unlock(&fld->lcf_lock);
+       spin_lock(&fld->lcf_lock);
+       rc = snprintf(page, count, "%s\n", fld->lcf_hash->fh_name);
+       spin_unlock(&fld->lcf_lock);
 
        RETURN(rc);
 }
@@ -127,16 +126,16 @@ fld_proc_write_hash(struct file *file, const char *buffer,
                 }
         }
 
-        if (hash != NULL) {
-                cfs_spin_lock(&fld->lcf_lock);
-                fld->lcf_hash = hash;
-                cfs_spin_unlock(&fld->lcf_lock);
+       if (hash != NULL) {
+               spin_lock(&fld->lcf_lock);
+               fld->lcf_hash = hash;
+               spin_unlock(&fld->lcf_lock);
 
-                CDEBUG(D_INFO, "%s: Changed hash to \"%s\"\n",
-                       fld->lcf_name, hash->fh_name);
-        }
+               CDEBUG(D_INFO, "%s: Changed hash to \"%s\"\n",
+                      fld->lcf_name, hash->fh_name);
+       }
 
-        RETURN(count);
+       RETURN(count);
 }
 
 static int
@@ -156,106 +155,93 @@ fld_proc_write_cache_flush(struct file *file, const char *buffer,
 }
 
 struct fld_seq_param {
-       struct lu_env  fsp_env;
-       struct dt_it  *fsp_it;
+       struct lu_env           fsp_env;
+       struct dt_it            *fsp_it;
+       struct lu_server_fld    *fsp_fld;
+       int                     fsp_stop:1;
 };
 
 static void *fldb_seq_start(struct seq_file *p, loff_t *pos)
 {
-       struct lu_server_fld    *fld = p->private;
-       struct dt_object        *obj;
-       const struct dt_it_ops  *iops;
-       struct fld_seq_param    *param;
-       struct fld_thread_info  *info;
+       struct fld_seq_param    *param = p->private;
+       struct lu_server_fld    *fld;
+       struct dt_object        *obj;
+       const struct dt_it_ops  *iops;
 
-       if (fld->lsf_obj == NULL)
+       if (param == NULL || param->fsp_stop)
                return NULL;
 
+       fld = param->fsp_fld;
        obj = fld->lsf_obj;
+       LASSERT(obj != NULL);
        iops = &obj->do_index_ops->dio_it;
 
-       OBD_ALLOC_PTR(param);
-       if (param == NULL)
-               return ERR_PTR(-ENOMEM);
-
-       lu_env_init(&param->fsp_env, LCT_MD_THREAD);
-       param->fsp_it = iops->init(&param->fsp_env, obj, 0, NULL);
-       info = lu_context_key_get(&param->fsp_env.le_ctx,
-                                 &fld_thread_key);
-
        iops->load(&param->fsp_env, param->fsp_it, *pos);
 
+       *pos = be64_to_cpu(*(__u64 *)iops->key(&param->fsp_env, param->fsp_it));
        return param;
 }
 
 static void fldb_seq_stop(struct seq_file *p, void *v)
 {
-       struct lu_server_fld    *fld = p->private;
-       struct dt_object        *obj;
+       struct fld_seq_param    *param = p->private;
        const struct dt_it_ops  *iops;
-       struct fld_seq_param    *param = (struct fld_seq_param *)v;
+       struct lu_server_fld    *fld;
+       struct dt_object        *obj;
 
-       if (fld->lsf_obj == NULL)
+       if (param == NULL)
                return;
 
+       fld = param->fsp_fld;
        obj = fld->lsf_obj;
+       LASSERT(obj != NULL);
        iops = &obj->do_index_ops->dio_it;
-       if (IS_ERR(param) || param == NULL)
-               return;
 
        iops->put(&param->fsp_env, param->fsp_it);
-       iops->fini(&param->fsp_env, param->fsp_it);
-       lu_env_fini(&param->fsp_env);
-       OBD_FREE_PTR(param);
-
-       return;
 }
 
 static void *fldb_seq_next(struct seq_file *p, void *v, loff_t *pos)
 {
-       struct lu_server_fld    *fld = p->private;
+       struct fld_seq_param    *param = p->private;
+       struct lu_server_fld    *fld;
        struct dt_object        *obj;
        const struct dt_it_ops  *iops;
-       struct fld_seq_param    *param = (struct fld_seq_param *)v;
        int                     rc;
 
-       if (fld->lsf_obj == NULL)
+       if (param == NULL || param->fsp_stop)
                return NULL;
 
+       fld = param->fsp_fld;
        obj = fld->lsf_obj;
+       LASSERT(obj != NULL);
        iops = &obj->do_index_ops->dio_it;
 
-       iops->get(&param->fsp_env, param->fsp_it,
-                 (const struct dt_key *)pos);
-
        rc = iops->next(&param->fsp_env, param->fsp_it);
        if (rc > 0) {
-               iops->put(&param->fsp_env, param->fsp_it);
-               iops->fini(&param->fsp_env, param->fsp_it);
-               lu_env_fini(&param->fsp_env);
-               OBD_FREE_PTR(param);
+               param->fsp_stop = 1;
                return NULL;
        }
 
-       *pos = *(loff_t *)iops->key(&param->fsp_env, param->fsp_it);
-
+       *pos = be64_to_cpu(*(__u64 *)iops->key(&param->fsp_env, param->fsp_it));
        return param;
 }
 
 static int fldb_seq_show(struct seq_file *p, void *v)
 {
-       struct lu_server_fld    *fld = p->private;
-       struct dt_object        *obj = fld->lsf_obj;
-       struct fld_seq_param    *param = (struct fld_seq_param *)v;
+       struct fld_seq_param    *param = p->private;
+       struct lu_server_fld    *fld;
+       struct dt_object        *obj;
        const struct dt_it_ops  *iops;
        struct fld_thread_info  *info;
        struct lu_seq_range     *fld_rec;
        int                     rc;
 
-       if (fld->lsf_obj == NULL)
+       if (param == NULL || param->fsp_stop)
                return 0;
 
+       fld = param->fsp_fld;
        obj = fld->lsf_obj;
+       LASSERT(obj != NULL);
        iops = &obj->do_index_ops->dio_it;
 
        info = lu_context_key_get(&param->fsp_env.le_ctx,
@@ -271,8 +257,6 @@ static int fldb_seq_show(struct seq_file *p, void *v)
                rc = seq_printf(p, DRANGE"\n", PRANGE(fld_rec));
        }
 
-       iops->put(&param->fsp_env, param->fsp_it);
-
        return rc;
 }
 
@@ -285,19 +269,84 @@ struct seq_operations fldb_sops = {
 
 static int fldb_seq_open(struct inode *inode, struct file *file)
 {
-       struct proc_dir_entry *dp = PDE(inode);
-       struct seq_file *seq;
-       int rc;
+       struct proc_dir_entry   *dp = PDE(inode);
+       struct seq_file         *seq;
+       struct lu_server_fld    *fld = (struct lu_server_fld *)dp->data;
+       struct dt_object        *obj;
+       const struct dt_it_ops  *iops;
+       struct fld_seq_param    *param = NULL;
+       int                     env_init = 0;
+       int                     rc;
 
        LPROCFS_ENTRY_AND_CHECK(dp);
        rc = seq_open(file, &fldb_sops);
-       if (rc) {
-               LPROCFS_EXIT();
-               return rc;
+       if (rc)
+               GOTO(out, rc);
+
+       obj = fld->lsf_obj;
+       if (obj == NULL) {
+               seq = file->private_data;
+               seq->private = NULL;
+               return 0;
        }
 
+       OBD_ALLOC_PTR(param);
+       if (param == NULL)
+               GOTO(out, rc = -ENOMEM);
+
+       rc = lu_env_init(&param->fsp_env, LCT_MD_THREAD);
+       if (rc != 0)
+               GOTO(out, rc);
+
+       env_init = 1;
+       iops = &obj->do_index_ops->dio_it;
+       param->fsp_it = iops->init(&param->fsp_env, obj, 0, NULL);
+       if (IS_ERR(param->fsp_it))
+               GOTO(out, rc = PTR_ERR(param->fsp_it));
+
+       param->fsp_fld = fld;
+       param->fsp_stop = 0;
+
        seq = file->private_data;
-       seq->private = dp->data;
+       seq->private = param;
+out:
+       if (rc != 0) {
+               if (env_init == 1)
+                       lu_env_fini(&param->fsp_env);
+               if (param != NULL)
+                       OBD_FREE_PTR(param);
+               LPROCFS_EXIT();
+       }
+       return rc;
+}
+
+static int fldb_seq_release(struct inode *inode, struct file *file)
+{
+       struct seq_file         *seq = file->private_data;
+       struct fld_seq_param    *param;
+       struct lu_server_fld    *fld;
+       struct dt_object        *obj;
+       const struct dt_it_ops  *iops;
+
+       param = seq->private;
+       if (param == NULL) {
+               lprocfs_seq_release(inode, file);
+               return 0;
+       }
+
+       fld = param->fsp_fld;
+       obj = fld->lsf_obj;
+       LASSERT(obj != NULL);
+       iops = &obj->do_index_ops->dio_it;
+
+       LASSERT(iops != NULL);
+       LASSERT(obj != NULL);
+       LASSERT(param->fsp_it != NULL);
+       iops->fini(&param->fsp_env, param->fsp_it);
+       lu_env_fini(&param->fsp_env);
+       OBD_FREE_PTR(param);
+       lprocfs_seq_release(inode, file);
+
        return 0;
 }
 
@@ -314,8 +363,7 @@ struct file_operations fld_proc_seq_fops = {
        .owner   = THIS_MODULE,
        .open    = fldb_seq_open,
        .read    = seq_read,
-       .llseek  = seq_lseek,
-       .release = lprocfs_seq_release,
+       .release = fldb_seq_release,
 };
 
 #endif
Lustre primary development and releases