Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let's even be specific about the fact that it's the script library that we
[fs/lustre-release.git]
/
lustre
/
lvfs
/
llog_cat.c
diff --git
a/lustre/lvfs/llog_cat.c
b/lustre/lvfs/llog_cat.c
index
901a4a2
..
deadb3d
100644
(file)
--- a/
lustre/lvfs/llog_cat.c
+++ b/
lustre/lvfs/llog_cat.c
@@
-39,7
+39,7
@@
#endif
#include <linux/lustre_log.h>
#endif
#include <linux/lustre_log.h>
-#include <
portal
s/list.h>
+#include <
libcf
s/list.h>
/* Create a new log handle and add it to the open list.
* This log handle will be closed when all of the records in it are removed.
/* Create a new log handle and add it to the open list.
* This log handle will be closed when all of the records in it are removed.
@@
-262,7
+262,7
@@
static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
up_write(&cathandle->lgh_lock);
RETURN(loghandle);
} else {
up_write(&cathandle->lgh_lock);
RETURN(loghandle);
} else {
-
down
_write(&loghandle->lgh_lock);
+
up
_write(&loghandle->lgh_lock);
}
}
}
}
@@
-371,7
+371,7
@@
static int llog_cat_process_cb(struct llog_handle *cat_llh,
CERROR("invalid record in catalog\n");
RETURN(-EINVAL);
}
CERROR("invalid record in catalog\n");
RETURN(-EINVAL);
}
- C
WARN(
"processing log "LPX64":%x at index %u of catalog "LPX64"\n",
+ C
DEBUG(D_INFO,
"processing log "LPX64":%x at index %u of catalog "LPX64"\n",
lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
le32_to_cpu(rec->lrh_index), cat_llh->lgh_id.lgl_oid);
lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
le32_to_cpu(rec->lrh_index), cat_llh->lgh_id.lgl_oid);
@@
-625,8
+625,7
@@
int llog_catalog_cleanup(struct llog_ctxt *ctxt)
cathandle = ctxt->loc_handle;
if (cathandle)
llog_cat_put(ctxt->loc_handle);
cathandle = ctxt->loc_handle;
if (cathandle)
llog_cat_put(ctxt->loc_handle);
-
-// OBD_FREE(ctxt, sizeof(*ctxt));
+
return 0;
}
EXPORT_SYMBOL(llog_catalog_cleanup);
return 0;
}
EXPORT_SYMBOL(llog_catalog_cleanup);