X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_osd.c;h=a47d7095f25fbcfe23787191a474f94efaee57bf;hb=370de927fc5;hp=d9434d78c3a757206fd2d7ae52ead196d91e7ee1;hpb=e1a87d94e89c175ac8a432be5d6eec138e8915fc;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/llog_osd.c b/lustre/obdclass/llog_osd.c
index d9434d7..a47d709 100644
--- 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))