LU-6824 ldiskfs: give warning with dir htree growing

[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 a6fed15..ae3d5c1 100644 (file)
--- a/lustre/osd-ldiskfs/osd_oi.c
+++ b/lustre/osd-ldiskfs/osd_oi.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) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -151,7 +151,7 @@ static int osd_oi_index_create_one(struct osd_thread_info *info,
                                     feat->dif_ptrsize, feat->dif_recsize_max,
                                     jh);
        dentry = osd_child_dentry_by_inode(env, dir, name, strlen(name));
-       rc = osd_ldiskfs_add_entry(jh, dentry, inode, NULL);
+       rc = osd_ldiskfs_add_entry(info, jh, dentry, inode, NULL);
        ldiskfs_journal_stop(jh);
        iput(inode);
        return rc;
@@ -338,7 +338,54 @@ osd_oi_table_open(struct osd_thread_info *info, struct osd_device *osd,
        RETURN(count);
 }
 
-int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd)
+static int osd_remove_oi_one(struct dentry *parent, const char *name,
+                            int namelen)
+{
+       struct dentry *child;
+       int rc;
+
+       child = ll_lookup_one_len(name, parent, namelen);
+       if (IS_ERR(child)) {
+               rc = PTR_ERR(child);
+       } else {
+               rc = ll_vfs_unlink(parent->d_inode, child);
+               dput(child);
+       }
+
+       return rc == -ENOENT ? 0 : rc;
+}
+
+static int osd_remove_ois(struct osd_thread_info *info, struct osd_device *osd)
+{
+       char name[16];
+       int namelen;
+       int rc;
+       int i;
+
+       for (i = 0; i < osd->od_scrub.os_file.sf_oi_count; i++) {
+               namelen = snprintf(name, sizeof(name), "%s.%d",
+                                  OSD_OI_NAME_BASE, i);
+               rc = osd_remove_oi_one(osd_sb(osd)->s_root, name, namelen);
+               if (rc != 0) {
+                       CERROR("%.16s: fail to remove the stale OI file %s: "
+                              "rc = %d\n",
+                              LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name,
+                              name, rc);
+                       return rc;
+               }
+       }
+
+       namelen = snprintf(name, sizeof(name), "%s", OSD_OI_NAME_BASE);
+       rc = osd_remove_oi_one(osd_sb(osd)->s_root, name, namelen);
+       if (rc != 0)
+               CERROR("%.16s: fail to remove the stale OI file %s: rc = %d\n",
+                      LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name, name, rc);
+
+       return rc;
+}
+
+int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd,
+               bool restored)
 {
        struct osd_scrub  *scrub = &osd->od_scrub;
        struct scrub_file *sf = &scrub->os_file;
@@ -346,6 +393,12 @@ int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd)
        int                rc;
        ENTRY;
 
+       if (restored) {
+               rc = osd_remove_ois(info, osd);
+               if (rc != 0)
+                       return rc;
+       }
+
        OBD_ALLOC(oi, sizeof(*oi) * OSD_OI_FID_NR_MAX);
        if (oi == NULL)
                RETURN(-ENOMEM);
@@ -647,7 +700,7 @@ int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
                        return rc;
 
                if (unlikely(osd_id_eq(id, oi_id)))
-                       return 0;
+                       return 1;
 
                /* Check whether the mapping for oi_id is valid or not. */
                inode = osd_iget(info, osd, oi_id);
@@ -658,6 +711,13 @@ int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
                        return rc;
                }
 
+               /* The EA inode should NOT be in OI, old OI scrub may added
+                * such OI mapping by wrong, replace it. */
+               if (unlikely(osd_is_ea_inode(inode))) {
+                       iput(inode);
+                       goto update;
+               }
+
                rc = osd_get_lma(info, inode, &info->oti_obj_dentry, lma);
                iput(inode);
                if (rc == -ENODATA)