LU-1842 quota: tunefs.lustre --quota

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_oi.c

diff --git a/lustre/osd-ldiskfs/osd_oi.c b/lustre/osd-ldiskfs/osd_oi.c
index dfa42ab..4319f47 100644 (file)
--- a/lustre/osd-ldiskfs/osd_oi.c
+++ b/lustre/osd-ldiskfs/osd_oi.c
@@ -287,7 +287,6 @@ static int
 osd_oi_table_open(struct osd_thread_info *info, struct osd_device *osd,
                  struct osd_oi **oi_table, unsigned oi_count, bool create)
 {
-       struct dt_device  *dev = &osd->od_dt_dev;
        struct scrub_file *sf = &osd->od_scrub.os_file;
        int                count = 0;
        int                rc = 0;
@@ -322,11 +321,12 @@ osd_oi_table_open(struct osd_thread_info *info, struct osd_device *osd,
                        continue;
                }
 
-               CERROR("%s: can't open %s: rc = %d\n",
-                      dev->dd_lu_dev.ld_obd->obd_name, name, rc);
+               CERROR("%.16s: can't open %s: rc = %d\n",
+                      LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name, name, rc);
                if (oi_count > 0)
-                       CERROR("%s: expect to open total %d OI files.\n",
-                              dev->dd_lu_dev.ld_obd->obd_name, oi_count);
+                       CERROR("%.16s: expect to open total %d OI files.\n",
+                              LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name,
+                              oi_count);
                break;
        }
 
@@ -340,7 +340,6 @@ osd_oi_table_open(struct osd_thread_info *info, struct osd_device *osd,
 
 int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd)
 {
-       struct dt_device  *dev = &osd->od_dt_dev;
        struct osd_scrub  *scrub = &osd->od_scrub;
        struct scrub_file *sf = &scrub->os_file;
        struct osd_oi    **oi;
@@ -373,8 +372,9 @@ int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd)
        if (rc == 0) { /* found single OI from old filesystem */
                GOTO(out, rc = 1);
        } else if (rc != -ENOENT) {
-               CERROR("%s: can't open %s: rc = %d\n",
-                      dev->dd_lu_dev.ld_obd->obd_name, OSD_OI_NAME_BASE, rc);
+               CERROR("%.16s: can't open %s: rc = %d\n",
+                      LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name,
+                      OSD_OI_NAME_BASE, rc);
                GOTO(out, rc);
        }
 
@@ -528,9 +528,6 @@ static int osd_oi_iam_insert(struct osd_thread_info *oti, struct osd_oi *oi,
         struct iam_path_descr *ipd;
         struct osd_thandle    *oh;
         int                    rc;
-#ifdef HAVE_QUOTA_SUPPORT
-        cfs_cap_t              save    = cfs_curproc_cap_pack();
-#endif
         ENTRY;
 
         LASSERT(oi);
@@ -544,9 +541,6 @@ static int osd_oi_iam_insert(struct osd_thread_info *oti, struct osd_oi *oi,
         oh = container_of0(th, struct osd_thandle, ot_super);
         LASSERT(oh->ot_handle != NULL);
         LASSERT(oh->ot_handle->h_transaction != NULL);
-#ifdef HAVE_QUOTA_SUPPORT
-       cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
-#endif
         if (S_ISDIR(oi->oi_inode->i_mode))
                 osd_fid_pack((struct osd_fid_pack *)iam_rec, rec,
                              &oti->oti_fid);
@@ -554,9 +548,6 @@ static int osd_oi_iam_insert(struct osd_thread_info *oti, struct osd_oi *oi,
                 iam_rec = (struct iam_rec *) rec;
         rc = iam_insert(oh->ot_handle, bag, (const struct iam_key *)key,
                         iam_rec, ipd);
-#ifdef HAVE_QUOTA_SUPPORT
-        cfs_curproc_cap_unpack(save);
-#endif
         osd_ipd_put(oti->oti_env, bag, ipd);
         LINVRNT(osd_invariant(obj));
         RETURN(rc);