LU-359 llite: no close error if application has known failure

[fs/lustre-release.git] / lustre / lvfs / quotafmt_test.c

diff --git a/lustre/lvfs/quotafmt_test.c b/lustre/lvfs/quotafmt_test.c
index f9e3c95..1f514f9 100644 (file)
--- a/lustre/lvfs/quotafmt_test.c
+++ b/lustre/lvfs/quotafmt_test.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,10 +39,6 @@
  * from the OBD setup function
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/errno.h>
@@ -81,15 +75,15 @@ static int quotfmt_initialize(struct lustre_quota_info *lqi,
                 char *name = test_quotafile[i];
                 int namelen = strlen(name);
 
-                /* remove the stale test quotafile */
-                LOCK_INODE_MUTEX_PARENT(parent_inode);
-                de = lookup_one_len(name, tgt->obd_lvfs_ctxt.pwd, namelen);
-                if (!IS_ERR(de) && de->d_inode)
-                        ll_vfs_unlink(parent_inode, de,
-                                      tgt->obd_lvfs_ctxt.pwdmnt);
-                if (!IS_ERR(de))
-                        dput(de);
-                UNLOCK_INODE_MUTEX(parent_inode);
+               /* remove the stale test quotafile */
+               mutex_lock_nested(&parent_inode->i_mutex, I_MUTEX_PARENT);
+               de = lookup_one_len(name, tgt->obd_lvfs_ctxt.pwd, namelen);
+               if (!IS_ERR(de) && de->d_inode)
+                       ll_vfs_unlink(parent_inode, de,
+                                     tgt->obd_lvfs_ctxt.pwdmnt);
+               if (!IS_ERR(de))
+                       dput(de);
+               mutex_unlock(&parent_inode->i_mutex);
 
                 /* create quota file */
                 fp = filp_open(name, O_CREAT | O_EXCL, 0644);
@@ -136,8 +130,8 @@ static int quotfmt_finalize(struct lustre_quota_info *lqi,
                 /* close quota file */
                 filp_close(lqi->qi_files[i], 0);
 
-                /* unlink quota file */
-                LOCK_INODE_MUTEX_PARENT(parent_inode);
+               /* unlink quota file */
+               mutex_lock_nested(&parent_inode->i_mutex, I_MUTEX_PARENT);
 
                 de = lookup_one_len(name, tgt->obd_lvfs_ctxt.pwd, namelen);
                 if (IS_ERR(de) || de->d_inode == NULL) {
@@ -151,10 +145,10 @@ static int quotfmt_finalize(struct lustre_quota_info *lqi,
                 if (rc)
                         CERROR("error unlink quotafile %s (rc = %d)\n",
                                name, rc);
-              dput:
-                if (!IS_ERR(de))
-                        dput(de);
-                UNLOCK_INODE_MUTEX(parent_inode);
+dput:
+               if (!IS_ERR(de))
+                       dput(de);
+               mutex_unlock(&parent_inode->i_mutex);
         }
 
         pop_ctxt(saved, &tgt->obd_lvfs_ctxt, NULL);
@@ -379,37 +373,6 @@ static int quotfmt_test_4(struct lustre_quota_info *lqi)
         RETURN(rc);
 }
 
-static int quotfmt_test_5(struct lustre_quota_info *lqi)
-{
-#ifndef KERNEL_SUPPORTS_QUOTA_READ
-        int i, rc = 0;
-
-        for (i = USRQUOTA; i < MAXQUOTAS && !rc; i++) {
-                cfs_list_t list;
-                struct dquot_id *dqid, *tmp;
-
-                CFS_INIT_LIST_HEAD(&list);
-                rc = lustre_get_qids(lqi->qi_files[i], NULL, i, &list);
-                if (rc) {
-                        CERROR("%s get all %ss (rc:%d):\n",
-                               rc ? "error" : "success",
-                               i == USRQUOTA ? "uid" : "gid", rc);
-                }
-                cfs_list_for_each_entry_safe(dqid, tmp, &list, di_link) {
-                        cfs_list_del_init(&dqid->di_link);
-                        if (rc == 0)
-                                CDEBUG(D_INFO, "%d ", dqid->di_id);
-                        kfree(dqid);
-                }
-                CDEBUG(D_INFO, "\n");
-        }
-        return rc;
-#else
-        CWARN("kernel supports quota_read OR kernel version >= 2.6.12, test skipped\n");
-        return 0;
-#endif
-}
-
 static int quotfmt_run_tests(struct obd_device *obd, struct obd_device *tgt)
 {
         struct lvfs_run_ctxt saved;
@@ -456,14 +419,7 @@ static int quotfmt_run_tests(struct obd_device *obd, struct obd_device *tgt)
                 GOTO(out, rc);
         }
 
-        CWARN("=== test 5: walk through quota file to get all ids\n");
-        rc = quotfmt_test_5(lqi);
-        if (rc) {
-                CERROR("walk through quota file failed\n");
-                GOTO(out, rc);
-        }
-
-      out:
+out:
         CWARN("=== Finalize quotafile test\n");
         rc = quotfmt_finalize(lqi, tgt, &saved);
         OBD_FREE(lqi, sizeof(*lqi));