LU-3531 mdt: delete striped directory

[fs/lustre-release.git] / lustre / obdclass / llog_osd.c

diff --git a/lustre/obdclass/llog_osd.c b/lustre/obdclass/llog_osd.c
index d9434d7..a47d709 100644 (file)
--- a/lustre/obdclass/llog_osd.c
+++ b/lustre/obdclass/llog_osd.c
@@ -1169,7 +1169,8 @@ EXPORT_SYMBOL(llog_osd_ops);
 
 /* reads the catalog list */
 int llog_osd_get_cat_list(const struct lu_env *env, struct dt_device *d,
-                         int idx, int count, struct llog_catid *idarray)
+                         int idx, int count, struct llog_catid *idarray,
+                         const struct lu_fid *fid)
 {
        struct llog_thread_info *lgi = llog_info(env);
        struct dt_object        *o = NULL;
@@ -1183,8 +1184,7 @@ int llog_osd_get_cat_list(const struct lu_env *env, struct dt_device *d,
        size = sizeof(*idarray) * count;
        lgi->lgi_off = idx *  sizeof(*idarray);
 
-       lu_local_obj_fid(&lgi->lgi_fid, LLOG_CATALOGS_OID);
-
+       lgi->lgi_fid = *fid;
        o = dt_locate(env, d, &lgi->lgi_fid);
        if (IS_ERR(o))
                RETURN(PTR_ERR(o));
@@ -1263,7 +1263,8 @@ EXPORT_SYMBOL(llog_osd_get_cat_list);
 
 /* writes the cat list */
 int llog_osd_put_cat_list(const struct lu_env *env, struct dt_device *d,
-                         int idx, int count, struct llog_catid *idarray)
+                         int idx, int count, struct llog_catid *idarray,
+                         const struct lu_fid *fid)
 {
        struct llog_thread_info *lgi = llog_info(env);
        struct dt_object        *o = NULL;
@@ -1277,8 +1278,7 @@ int llog_osd_put_cat_list(const struct lu_env *env, struct dt_device *d,
 
        size = sizeof(*idarray) * count;
        lgi->lgi_off = idx * sizeof(*idarray);
-
-       lu_local_obj_fid(&lgi->lgi_fid, LLOG_CATALOGS_OID);
+       lgi->lgi_fid = *fid;
 
        o = dt_locate(env, d, &lgi->lgi_fid);
        if (IS_ERR(o))