LU-2646 osd: add special flag for agent inode.

1. Add special flag into the LMA of agent inode of remote entry,
so lfsck check can skip this inode.

2. Assign a local FID for Agent dir, so lfsck can skip this agent
dir as well.

Signed-off-by: wang di <di.wang@intel.com>
Change-Id: Ifc50fbc531a4306a76d5263dd6135c613d7a2a30
Reviewed-on: http://review.whamcloud.com/5625
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 4973245..f830dc3 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -280,6 +280,9 @@ enum lma_compat {
  */
 enum lma_incompat {
        LMAI_RELEASED = 0x0000001, /* file is released */
  */
 enum lma_incompat {
        LMAI_RELEASED = 0x0000001, /* file is released */

+       LMAI_AGENT = 0x00000002, /* agent inode */
+       LMAI_REMOTE_PARENT = 0x00000004, /* the parent of the object
+                                           is on the remote MDT */

 };
 #define LMA_INCOMPAT_SUPP 0x0
 
 };
 #define LMA_INCOMPAT_SUPP 0x0
 


@@ -313,7 +316,7 @@ struct lustre_mdt_attrs {
 
 extern void lustre_lma_swab(struct lustre_mdt_attrs *lma);
 extern void lustre_lma_init(struct lustre_mdt_attrs *lma,
 
 extern void lustre_lma_swab(struct lustre_mdt_attrs *lma);
 extern void lustre_lma_init(struct lustre_mdt_attrs *lma,

-                           const struct lu_fid *fid);
+                           const struct lu_fid *fid, __u32 incompat);

 /**
  * SOM on-disk attributes stored in a separate xattr.
  */
 /**
  * SOM on-disk attributes stored in a separate xattr.
  */

diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index 59be208..d662c3f 100644 (file)
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -233,6 +233,7 @@ enum local_oid {
        OFD_HEALTH_CHECK_OID    = 4120UL,
        MDD_LOV_OBJ_OSEQ        = 4121UL,
        LFSCK_NAMESPACE_OID     = 4122UL,
        OFD_HEALTH_CHECK_OID    = 4120UL,
        MDD_LOV_OBJ_OSEQ        = 4121UL,
        LFSCK_NAMESPACE_OID     = 4122UL,

+       REMOTE_PARENT_DIR_OID   = 4123UL,

 };
 
 static inline void lu_local_obj_fid(struct lu_fid *fid, __u32 oid)
 };
 
 static inline void lu_local_obj_fid(struct lu_fid *fid, __u32 oid)

diff --git a/lustre/mdd/mdd_compat.c b/lustre/mdd/mdd_compat.c
index f718025..fed84e3 100644 (file)
--- a/lustre/mdd/mdd_compat.c
+++ b/lustre/mdd/mdd_compat.c
@@ -180,7 +180,7 @@ static int mdd_convert_lma(const struct lu_env *env, struct mdd_device *mdd,
        lu_root_fid(&fid);
 
        lma = (struct lustre_mdt_attrs *)&mdd_env_info(env)->mti_xattr_buf;
        lu_root_fid(&fid);
 
        lma = (struct lustre_mdt_attrs *)&mdd_env_info(env)->mti_xattr_buf;

-       lustre_lma_init(lma, &fid);
+       lustre_lma_init(lma, &fid, 0);

        lustre_lma_swab(lma);
        buf.lb_buf = lma;
        buf.lb_len = sizeof(*lma);
        lustre_lma_swab(lma);
        buf.lb_buf = lma;
        buf.lb_len = sizeof(*lma);

diff --git a/lustre/obdclass/md_attrs.c b/lustre/obdclass/md_attrs.c
index 8aa4af1..7d5364a 100644 (file)
--- a/lustre/obdclass/md_attrs.c
+++ b/lustre/obdclass/md_attrs.c
@@ -36,13 +36,15 @@
  *
  * \param lma - is the new LMA structure to be initialized
  * \param fid - is the FID of the object this LMA belongs to
  *
  * \param lma - is the new LMA structure to be initialized
  * \param fid - is the FID of the object this LMA belongs to

+ * \param incompat - features that MDS must understand to access object

  */
  */

-void lustre_lma_init(struct lustre_mdt_attrs *lma, const struct lu_fid *fid)
+void lustre_lma_init(struct lustre_mdt_attrs *lma, const struct lu_fid *fid,
+                    __u32 incompat)

 {
        lma->lma_compat   = 0;
 {
        lma->lma_compat   = 0;

-       lma->lma_incompat = 0;
+       lma->lma_incompat = incompat;

        lma->lma_self_fid = *fid;
        lma->lma_self_fid = *fid;

-       lma->lma_flags    = 0;
+       lma->lma_flags = 0;

 
        /* If a field is added in struct lustre_mdt_attrs, zero it explicitly
         * and change the test below. */
 
        /* If a field is added in struct lustre_mdt_attrs, zero it explicitly
         * and change the test below. */

diff --git a/lustre/osd-ldiskfs/osd_compat.c b/lustre/osd-ldiskfs/osd_compat.c
index 03f7757..806fcc0 100644 (file)
--- a/lustre/osd-ldiskfs/osd_compat.c
+++ b/lustre/osd-ldiskfs/osd_compat.c
@@ -46,6 +46,8 @@
 #include <linux/types.h>
 /* prerequisite for linux/xattr.h */
 #include <linux/fs.h>
 #include <linux/types.h>
 /* prerequisite for linux/xattr.h */
 #include <linux/fs.h>

+/* XATTR_{REPLACE,CREATE} */
+#include <linux/xattr.h>

 
 /*
  * struct OBD_{ALLOC,FREE}*()
 
 /*
  * struct OBD_{ALLOC,FREE}*()


@@ -161,23 +163,17 @@ out:
        return count;
 }
 
        return count;
 }
 

-/*
- * directory structure on legacy MDT:
- *
- * REM_OBJ_DIR/ per mdt
- * AGENT_OBJ_DIR/ per mdt
- *
- */
-static const char remote_obj_dir[] = "REM_OBJ_DIR";
-static const char agent_obj_dir[] = "AGENT_OBJ_DIR";
-int osd_mdt_init(struct osd_device *dev)
+static const char remote_parent_dir[] = "REMOTE_PARENT_DIR";
+static int osd_mdt_init(const struct lu_env *env, struct osd_device *dev)

 {
 {

-       struct lvfs_run_ctxt  new;
-       struct lvfs_run_ctxt  save;
-       struct dentry   *parent;
-       struct osd_mdobj_map *omm;
-       struct dentry   *d;
-       int                rc = 0;
+       struct lvfs_run_ctxt    new;
+       struct lvfs_run_ctxt    save;
+       struct dentry           *parent;
+       struct osd_mdobj_map    *omm;
+       struct dentry           *d;
+       struct osd_thread_info  *info = osd_oti_get(env);
+       struct lu_fid           *fid = &info->oti_fid;
+       int                     rc = 0;

        ENTRY;
 
        OBD_ALLOC_PTR(dev->od_mdt_map);
        ENTRY;
 
        OBD_ALLOC_PTR(dev->od_mdt_map);


@@ -191,18 +187,23 @@ int osd_mdt_init(struct osd_device *dev)
        parent = osd_sb(dev)->s_root;
        osd_push_ctxt(dev, &new, &save);
 
        parent = osd_sb(dev)->s_root;
        osd_push_ctxt(dev, &new, &save);
 

-       d = simple_mkdir(parent, dev->od_mnt, agent_obj_dir,
+       d = simple_mkdir(parent, dev->od_mnt, remote_parent_dir,

                         0755, 1);
        if (IS_ERR(d))
                GOTO(cleanup, rc = PTR_ERR(d));
 
                         0755, 1);
        if (IS_ERR(d))
                GOTO(cleanup, rc = PTR_ERR(d));
 

-       omm->omm_agent_dentry = d;
+       omm->omm_remote_parent = d;

 
 

+       /* Set LMA for remote parent inode */
+       lu_local_obj_fid(fid, REMOTE_PARENT_DIR_OID);
+       rc = osd_ea_fid_set(info, d->d_inode, fid, 0);
+       if (rc != 0)
+               GOTO(cleanup, rc);

 cleanup:
        pop_ctxt(&save, &new, NULL);
        if (rc) {
 cleanup:
        pop_ctxt(&save, &new, NULL);
        if (rc) {

-               if (omm->omm_agent_dentry != NULL)
-                       dput(omm->omm_agent_dentry);
+               if (omm->omm_remote_parent != NULL)
+                       dput(omm->omm_remote_parent);

                OBD_FREE_PTR(omm);
                dev->od_mdt_map = NULL;
        }
                OBD_FREE_PTR(omm);
                dev->od_mdt_map = NULL;
        }


@@ -216,62 +217,90 @@ static void osd_mdt_fini(struct osd_device *osd)
        if (omm == NULL)
                return;
 
        if (omm == NULL)
                return;
 

-       if (omm->omm_agent_dentry)
-               dput(omm->omm_agent_dentry);
+       if (omm->omm_remote_parent)
+               dput(omm->omm_remote_parent);

 
        OBD_FREE_PTR(omm);
        osd->od_ost_map = NULL;
 }
 
 
        OBD_FREE_PTR(omm);
        osd->od_ost_map = NULL;
 }
 

-int osd_add_to_agent(const struct lu_env *env, struct osd_device *osd,
-                    struct osd_object *obj, struct osd_thandle *oh)
+int osd_add_to_remote_parent(const struct lu_env *env, struct osd_device *osd,
+                            struct osd_object *obj, struct osd_thandle *oh)

 {
        struct osd_mdobj_map    *omm = osd->od_mdt_map;
        struct osd_thread_info  *oti = osd_oti_get(env);
 {
        struct osd_mdobj_map    *omm = osd->od_mdt_map;
        struct osd_thread_info  *oti = osd_oti_get(env);

+       struct lustre_mdt_attrs *lma = &oti->oti_mdt_attrs;

        char                    *name = oti->oti_name;
        char                    *name = oti->oti_name;

-       struct dentry           *agent;
+       struct dentry           *dentry;

        struct dentry           *parent;
        int                     rc;
 
        struct dentry           *parent;
        int                     rc;
 

-       parent = omm->omm_agent_dentry;
+       /* Set REMOTE_PARENT in lma, so other process like unlink or lfsck
+        * can identify this object quickly */
+       rc = osd_get_lma(oti, obj->oo_inode, &oti->oti_obj_dentry, lma);
+       if (rc != 0)
+               RETURN(rc);
+
+       lma->lma_incompat |= LMAI_REMOTE_PARENT;
+       lustre_lma_swab(lma);
+       rc = __osd_xattr_set(oti, obj->oo_inode, XATTR_NAME_LMA, lma,
+                            sizeof(*lma), XATTR_REPLACE);
+       if (rc != 0)
+               RETURN(rc);
+
+       parent = omm->omm_remote_parent;

        sprintf(name, DFID_NOBRACE, PFID(lu_object_fid(&obj->oo_dt.do_lu)));
        sprintf(name, DFID_NOBRACE, PFID(lu_object_fid(&obj->oo_dt.do_lu)));

-       agent = osd_child_dentry_by_inode(env, parent->d_inode,
-                                         name, strlen(name));
+       dentry = osd_child_dentry_by_inode(env, parent->d_inode,
+                                          name, strlen(name));

        mutex_lock(&parent->d_inode->i_mutex);
        mutex_lock(&parent->d_inode->i_mutex);

-       rc = osd_ldiskfs_add_entry(oh->ot_handle, agent, obj->oo_inode, NULL);
-       LASSERTF(parent->d_inode->i_nlink > 1, "%s: agent inode nlink %d",
-                osd_name(osd), parent->d_inode->i_nlink);
+       rc = osd_ldiskfs_add_entry(oh->ot_handle, dentry, obj->oo_inode,
+                                  NULL);
+       LASSERTF(parent->d_inode->i_nlink > 1, "%s: %lu nlink %d",
+                osd_name(osd), parent->d_inode->i_ino,
+                parent->d_inode->i_nlink);

        parent->d_inode->i_nlink++;
        mark_inode_dirty(parent->d_inode);
        mutex_unlock(&parent->d_inode->i_mutex);
        RETURN(rc);
 }
 
        parent->d_inode->i_nlink++;
        mark_inode_dirty(parent->d_inode);
        mutex_unlock(&parent->d_inode->i_mutex);
        RETURN(rc);
 }
 

-int osd_delete_from_agent(const struct lu_env *env, struct osd_device *osd,
-                         struct osd_object *obj, struct osd_thandle *oh)
+int osd_delete_from_remote_parent(const struct lu_env *env,
+                                 struct osd_device *osd,
+                                 struct osd_object *obj,
+                                 struct osd_thandle *oh)

 {
        struct osd_mdobj_map       *omm = osd->od_mdt_map;
        struct osd_thread_info     *oti = osd_oti_get(env);
 {
        struct osd_mdobj_map       *omm = osd->od_mdt_map;
        struct osd_thread_info     *oti = osd_oti_get(env);

+       struct lustre_mdt_attrs    *lma = &oti->oti_mdt_attrs;

        char                       *name = oti->oti_name;
        char                       *name = oti->oti_name;

-       struct dentry              *agent;
+       struct dentry              *dentry;

        struct dentry              *parent;
        struct ldiskfs_dir_entry_2 *de;
        struct buffer_head         *bh;
        int                        rc;
 
        struct dentry              *parent;
        struct ldiskfs_dir_entry_2 *de;
        struct buffer_head         *bh;
        int                        rc;
 

-       parent = omm->omm_agent_dentry;
+       /* Check lma to see whether it is remote object */
+       rc = osd_get_lma(oti, obj->oo_inode, &oti->oti_obj_dentry, lma);
+       if (rc != 0)
+               RETURN(rc);
+
+       if (likely(!(lma->lma_incompat & LMAI_REMOTE_PARENT)))
+               RETURN(0);
+
+       parent = omm->omm_remote_parent;

        sprintf(name, DFID_NOBRACE, PFID(lu_object_fid(&obj->oo_dt.do_lu)));
        sprintf(name, DFID_NOBRACE, PFID(lu_object_fid(&obj->oo_dt.do_lu)));

-       agent = osd_child_dentry_by_inode(env, parent->d_inode,
-                                         name, strlen(name));
+       dentry = osd_child_dentry_by_inode(env, parent->d_inode,
+                                          name, strlen(name));

        mutex_lock(&parent->d_inode->i_mutex);
        mutex_lock(&parent->d_inode->i_mutex);

-       bh = osd_ldiskfs_find_entry(parent->d_inode, agent, &de, NULL);
+       bh = osd_ldiskfs_find_entry(parent->d_inode, dentry, &de, NULL);

        if (bh == NULL) {
                mutex_unlock(&parent->d_inode->i_mutex);
                RETURN(-ENOENT);
        }
        rc = ldiskfs_delete_entry(oh->ot_handle, parent->d_inode, de, bh);
        if (bh == NULL) {
                mutex_unlock(&parent->d_inode->i_mutex);
                RETURN(-ENOENT);
        }
        rc = ldiskfs_delete_entry(oh->ot_handle, parent->d_inode, de, bh);

-       LASSERTF(parent->d_inode->i_nlink > 1, "%s: agent inode nlink %d",
-                osd_name(osd), parent->d_inode->i_nlink);
+       LASSERTF(parent->d_inode->i_nlink > 1, "%s: %lu nlink %d",
+                osd_name(osd), parent->d_inode->i_ino,
+                parent->d_inode->i_nlink);

        parent->d_inode->i_nlink--;
        mark_inode_dirty(parent->d_inode);
        mutex_unlock(&parent->d_inode->i_mutex);
        parent->d_inode->i_nlink--;
        mark_inode_dirty(parent->d_inode);
        mutex_unlock(&parent->d_inode->i_mutex);


@@ -289,7 +318,7 @@ int osd_delete_from_agent(const struct lu_env *env, struct osd_device *osd,
  * CONFIGS
  *
  */
  * CONFIGS
  *
  */

-int osd_ost_init(struct osd_device *dev)
+static int osd_ost_init(struct osd_device *dev)

 {
        struct lvfs_run_ctxt  new;
        struct lvfs_run_ctxt  save;
 {
        struct lvfs_run_ctxt  new;
        struct lvfs_run_ctxt  save;


@@ -382,7 +411,7 @@ static void osd_ost_fini(struct osd_device *osd)
        EXIT;
 }
 
        EXIT;
 }
 

-int osd_obj_map_init(struct osd_device *dev)
+int osd_obj_map_init(const struct lu_env *env, struct osd_device *dev)

 {
        int rc;
        ENTRY;
 {
        int rc;
        ENTRY;


@@ -393,7 +422,7 @@ int osd_obj_map_init(struct osd_device *dev)
                RETURN(rc);
 
        /* prepare structures for MDS */
                RETURN(rc);
 
        /* prepare structures for MDS */

-       rc = osd_mdt_init(dev);
+       rc = osd_mdt_init(env, dev);

 
         RETURN(rc);
 }
 
         RETURN(rc);
 }

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index e1bc36f..2c4ec7f 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -2178,12 +2178,11 @@ static int osd_object_destroy(const struct lu_env *env,
        mutex_lock(&inode->i_mutex);
        if (S_ISDIR(inode->i_mode)) {
                LASSERT(osd_inode_unlinked(inode) || inode->i_nlink == 1);
        mutex_lock(&inode->i_mutex);
        if (S_ISDIR(inode->i_mode)) {
                LASSERT(osd_inode_unlinked(inode) || inode->i_nlink == 1);

-               /* it will check/delete the agent inode for every dir
-                * destory, how to optimize it? unlink performance
-                * impaction XXX */
-               result = osd_delete_from_agent(env, osd, obj, oh);
+               /* it will check/delete the inode from remote parent,
+                * how to optimize it? unlink performance impaction XXX */
+               result = osd_delete_from_remote_parent(env, osd, obj, oh);

                if (result != 0 && result != -ENOENT) {
                if (result != 0 && result != -ENOENT) {

-                       CERROR("%s: delete agent inode "DFID": rc = %d\n",
+                       CERROR("%s: delete inode "DFID": rc = %d\n",

                               osd_name(osd), PFID(fid), result);
                }
                spin_lock(&obj->oo_guard);
                               osd_name(osd), PFID(fid), result);
                }
                spin_lock(&obj->oo_guard);


@@ -2206,17 +2205,6 @@ static int osd_object_destroy(const struct lu_env *env,
         RETURN(0);
 }
 
         RETURN(0);
 }
 

-static inline int __osd_xattr_set(struct osd_thread_info *info,
-                                 struct inode *inode, const char *name,
-                                 const void *buf, int buflen, int fl)
-{
-       struct dentry *dentry = &info->oti_child_dentry;
-
-       ll_vfs_dq_init(inode);
-       dentry->d_inode = inode;
-       return inode->i_op->setxattr(dentry, name, buf, buflen, fl);
-}
-

 /**
  * Put the fid into lustre_mdt_attrs, and then place the structure
  * inode's ea. This fid should not be altered during the life time
 /**
  * Put the fid into lustre_mdt_attrs, and then place the structure
  * inode's ea. This fid should not be altered during the life time


@@ -2228,7 +2216,7 @@ static inline int __osd_xattr_set(struct osd_thread_info *info,
  * FIXME: It is good to have/use ldiskfs_xattr_set_handle() here
  */
 int osd_ea_fid_set(struct osd_thread_info *info, struct inode *inode,
  * FIXME: It is good to have/use ldiskfs_xattr_set_handle() here
  */
 int osd_ea_fid_set(struct osd_thread_info *info, struct inode *inode,

-                  const struct lu_fid *fid)
+                  const struct lu_fid *fid, __u64 flags)

 {
        struct lustre_mdt_attrs *lma = &info->oti_mdt_attrs;
        int                      rc;
 {
        struct lustre_mdt_attrs *lma = &info->oti_mdt_attrs;
        int                      rc;


@@ -2239,7 +2227,7 @@ int osd_ea_fid_set(struct osd_thread_info *info, struct inode *inode,
        if (OBD_FAIL_CHECK(OBD_FAIL_FID_IGIF) && fid_is_client_visible(fid))
                return 0;
 
        if (OBD_FAIL_CHECK(OBD_FAIL_FID_IGIF) && fid_is_client_visible(fid))
                return 0;
 

-       lustre_lma_init(lma, fid);
+       lustre_lma_init(lma, fid, flags);

        lustre_lma_swab(lma);
 
        rc = __osd_xattr_set(info, inode, XATTR_NAME_LMA, lma, sizeof(*lma),
        lustre_lma_swab(lma);
 
        rc = __osd_xattr_set(info, inode, XATTR_NAME_LMA, lma, sizeof(*lma),


@@ -2315,13 +2303,13 @@ static int osd_add_dot_dotdot_internal(struct osd_thread_info *info,
 }
 
 /**
 }
 
 /**

- * Create an local inode for remote entry
+ * Create an local agent inode for remote entry

  */
  */

-static struct inode *osd_create_remote_inode(const struct lu_env *env,
-                                            struct osd_device *osd,
-                                            struct osd_object *pobj,
-                                            const struct lu_fid *fid,
-                                            struct thandle *th)
+static struct inode *osd_create_local_agent_inode(const struct lu_env *env,
+                                                 struct osd_device *osd,
+                                                 struct osd_object *pobj,
+                                                 const struct lu_fid *fid,
+                                                 struct thandle *th)

 {
        struct osd_thread_info  *info = osd_oti_get(env);
        struct inode            *local;
 {
        struct osd_thread_info  *info = osd_oti_get(env);
        struct inode            *local;


@@ -2342,6 +2330,14 @@ static struct inode *osd_create_remote_inode(const struct lu_env *env,
                RETURN(local);
        }
 
                RETURN(local);
        }
 

+       /* Set special LMA flag for local agent inode */
+       rc = osd_ea_fid_set(info, local, fid, LMAI_AGENT);
+       if (rc != 0) {
+               CERROR("%s: set LMA for "DFID" remote inode failed: rc = %d\n",
+                      osd_name(osd), PFID(fid), rc);
+               RETURN(ERR_PTR(rc));
+       }
+

        rc = osd_add_dot_dotdot_internal(info, local, pobj->oo_inode,
                (const struct dt_rec *)lu_object_fid(&pobj->oo_dt.do_lu),
                (const struct dt_rec *)fid, oh);
        rc = osd_add_dot_dotdot_internal(info, local, pobj->oo_inode,
                (const struct dt_rec *)lu_object_fid(&pobj->oo_dt.do_lu),
                (const struct dt_rec *)fid, oh);


@@ -2422,7 +2418,7 @@ static int osd_object_ea_create(const struct lu_env *env, struct dt_object *dt,
        if ((result == 0) &&
            (fid_is_last_id(fid) ||
             !fid_is_on_ost(info, osd_dt_dev(th->th_dev), fid)))
        if ((result == 0) &&
            (fid_is_last_id(fid) ||
             !fid_is_on_ost(info, osd_dt_dev(th->th_dev), fid)))

-               result = osd_ea_fid_set(info, obj->oo_inode, fid);
+               result = osd_ea_fid_set(info, obj->oo_inode, fid, 0);

 
         if (result == 0)
                 result = __osd_oi_insert(env, obj, fid, th);
 
         if (result == 0)
                 result = __osd_oi_insert(env, obj, fid, th);


@@ -3930,18 +3926,19 @@ static int osd_index_ea_insert(const struct lu_env *env, struct dt_object *dt,
                        /* If parent on remote MDT, we need put this object
                         * under AGENT */
                        oh = container_of(th, typeof(*oh), ot_super);
                        /* If parent on remote MDT, we need put this object
                         * under AGENT */
                        oh = container_of(th, typeof(*oh), ot_super);

-                       rc = osd_add_to_agent(env, osd, obj, oh);
+                       rc = osd_add_to_remote_parent(env, osd, obj, oh);

                        if (rc != 0) {
                        if (rc != 0) {

-                               CERROR("%s: add agent "DFID" error: rc = %d\n",
+                               CERROR("%s: add "DFID" error: rc = %d\n",

                                       osd_name(osd),
                                       PFID(lu_object_fid(&dt->do_lu)), rc);
                                RETURN(rc);
                        }
 
                                       osd_name(osd),
                                       PFID(lu_object_fid(&dt->do_lu)), rc);
                                RETURN(rc);
                        }
 

-                       child_inode = igrab(omm->omm_agent_dentry->d_inode);
+                       child_inode = igrab(omm->omm_remote_parent->d_inode);

                } else {
                } else {

-                       child_inode = osd_create_remote_inode(env, osd, obj,
-                                                             fid, th);
+                       child_inode = osd_create_local_agent_inode(env, osd,
+                                                                  obj, fid,
+                                                                  th);

                        if (IS_ERR(child_inode))
                                RETURN(PTR_ERR(child_inode));
                }
                        if (IS_ERR(child_inode))
                                RETURN(PTR_ERR(child_inode));
                }


@@ -4805,7 +4802,7 @@ again:
                if (unlikely(fid_is_sane(fid))) {
                        /* FID-in-dirent exists, but FID-in-LMA is lost.
                         * Trust the FID-in-dirent, and add FID-in-LMA. */
                if (unlikely(fid_is_sane(fid))) {
                        /* FID-in-dirent exists, but FID-in-LMA is lost.
                         * Trust the FID-in-dirent, and add FID-in-LMA. */

-                       rc = osd_ea_fid_set(info, inode, fid);
+                       rc = osd_ea_fid_set(info, inode, fid, 0);

                        if (rc == 0)
                                *attr |= LUDA_REPAIR;
                } else {
                        if (rc == 0)
                                *attr |= LUDA_REPAIR;
                } else {


@@ -5273,7 +5270,7 @@ static int osd_device_init0(const struct lu_env *env,
                GOTO(out_mnt, rc);
        }
 
                GOTO(out_mnt, rc);
        }
 

-       rc = osd_obj_map_init(o);
+       rc = osd_obj_map_init(env, o);

        if (rc != 0)
                GOTO(out_scrub, rc);
 
        if (rc != 0)
                GOTO(out_scrub, rc);
 

diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
index 31529f8..45dec42 100644 (file)
--- a/lustre/osd-ldiskfs/osd_internal.h
+++ b/lustre/osd-ldiskfs/osd_internal.h
@@ -168,7 +168,7 @@ struct osd_mdobj {
 };
 
 struct osd_mdobj_map {
 };
 
 struct osd_mdobj_map {

-       struct dentry   *omm_agent_dentry;
+       struct dentry   *omm_remote_parent;

 };
 
 #define osd_ldiskfs_find_entry(dir, dentry, de, lock)   \
 };
 
 #define osd_ldiskfs_find_entry(dir, dentry, de, lock)   \


@@ -605,6 +605,17 @@ struct osd_thread_info {
 
 extern int ldiskfs_pdo;
 
 
 extern int ldiskfs_pdo;
 

+static inline int __osd_xattr_set(struct osd_thread_info *info,
+                                 struct inode *inode, const char *name,
+                                 const void *buf, int buflen, int fl)
+{
+       struct dentry *dentry = &info->oti_child_dentry;
+
+       ll_vfs_dq_init(inode);
+       dentry->d_inode = inode;
+       return inode->i_op->setxattr(dentry, name, buf, buflen, fl);
+}
+

 #ifdef LPROCFS
 /* osd_lproc.c */
 void lprocfs_osd_init_vars(struct lprocfs_static_vars *lvars);
 #ifdef LPROCFS
 /* osd_lproc.c */
 void lprocfs_osd_init_vars(struct lprocfs_static_vars *lvars);


@@ -620,11 +631,11 @@ int osd_object_auth(const struct lu_env *env, struct dt_object *dt,
 struct inode *osd_iget(struct osd_thread_info *info, struct osd_device *dev,
                       struct osd_inode_id *id);
 int osd_ea_fid_set(struct osd_thread_info *info, struct inode *inode,
 struct inode *osd_iget(struct osd_thread_info *info, struct osd_device *dev,
                       struct osd_inode_id *id);
 int osd_ea_fid_set(struct osd_thread_info *info, struct inode *inode,

-                  const struct lu_fid *fid);
+                  const struct lu_fid *fid, __u64 flags);

 int osd_get_lma(struct osd_thread_info *info, struct inode *inode,
                struct dentry *dentry, struct lustre_mdt_attrs *lma);
 
 int osd_get_lma(struct osd_thread_info *info, struct inode *inode,
                struct dentry *dentry, struct lustre_mdt_attrs *lma);
 

-int osd_obj_map_init(struct osd_device *osd);
+int osd_obj_map_init(const struct lu_env *env, struct osd_device *osd);

 void osd_obj_map_fini(struct osd_device *dev);
 int osd_obj_map_lookup(struct osd_thread_info *info, struct osd_device *osd,
                        const struct lu_fid *fid, struct osd_inode_id *id);
 void osd_obj_map_fini(struct osd_device *dev);
 int osd_obj_map_lookup(struct osd_thread_info *info, struct osd_device *osd,
                        const struct lu_fid *fid, struct osd_inode_id *id);


@@ -653,14 +664,13 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len);
 
 int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
                   const struct lu_fid *fid, struct lu_seq_range *range);
 
 int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
                   const struct lu_fid *fid, struct lu_seq_range *range);

-struct dentry *osd_agent_lookup(struct osd_mdobj_map *omm, int index);
-struct dentry *osd_agent_load(const struct osd_device *osd, int mdt_index,
-                             int create);
-
-int osd_delete_from_agent(const struct lu_env *env, struct osd_device *osd,
-                         struct osd_object *obj, struct osd_thandle *oh);
-int osd_add_to_agent(const struct lu_env *env, struct osd_device *osd,
-                    struct osd_object *obj, struct osd_thandle *oh);
+
+int osd_delete_from_remote_parent(const struct lu_env *env,
+                                 struct osd_device *osd,
+                                 struct osd_object *obj,
+                                 struct osd_thandle *oh);
+int osd_add_to_remote_parent(const struct lu_env *env, struct osd_device *osd,
+                            struct osd_object *obj, struct osd_thandle *oh);

 
 /* osd_quota_fmt.c */
 int walk_tree_dqentry(const struct lu_env *env, struct osd_object *obj,
 
 /* osd_quota_fmt.c */
 int walk_tree_dqentry(const struct lu_env *env, struct osd_object *obj,

diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
index 3736410..1e27918 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -455,7 +455,7 @@ iget:
                ops = DTO_INDEX_INSERT;
                idx = osd_oi_fid2idx(dev, fid);
                if (val == SCRUB_NEXT_NOLMA) {
                ops = DTO_INDEX_INSERT;
                idx = osd_oi_fid2idx(dev, fid);
                if (val == SCRUB_NEXT_NOLMA) {

-                       rc = osd_ea_fid_set(info, inode, fid);
+                       rc = osd_ea_fid_set(info, inode, fid, 0);

                        if (rc != 0)
                                GOTO(out, rc);
                } else {
                        if (rc != 0)
                                GOTO(out, rc);
                } else {


@@ -1254,7 +1254,7 @@ osd_ios_scan_one(struct osd_thread_info *info, struct osd_device *dev,
                        lu_igif_build(&tfid, inode->i_ino, inode->i_generation);
                else
                        tfid = *fid;
                        lu_igif_build(&tfid, inode->i_ino, inode->i_generation);
                else
                        tfid = *fid;

-               rc = osd_ea_fid_set(info, inode, &tfid);
+               rc = osd_ea_fid_set(info, inode, &tfid, 0);

                if (rc != 0)
                        RETURN(rc);
        } else {
                if (rc != 0)
                        RETURN(rc);
        } else {

diff --git a/lustre/osd-zfs/osd_object.c b/lustre/osd-zfs/osd_object.c
index e7511bf..1265475 100644 (file)
--- a/lustre/osd-zfs/osd_object.c
+++ b/lustre/osd-zfs/osd_object.c
@@ -1391,7 +1391,7 @@ static inline int osd_init_lma(const struct lu_env *env, struct osd_object *obj,
        struct lu_buf            buf;
        int rc;
 
        struct lu_buf            buf;
        int rc;
 

-       lustre_lma_init(lma, fid);
+       lustre_lma_init(lma, fid, 0);

        lustre_lma_swab(lma);
        buf.lb_buf = lma;
        buf.lb_len = sizeof(*lma);
        lustre_lma_swab(lma);
        buf.lb_buf = lma;
        buf.lb_len = sizeof(*lma);