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
LU-1302 llog: structures changes, llog_thread_info
[fs/lustre-release.git]
/
lustre
/
obdclass
/
llog_cat.c
diff --git
a/lustre/obdclass/llog_cat.c
b/lustre/obdclass/llog_cat.c
index
69c1dfb
..
54e911f
100644
(file)
--- a/
lustre/obdclass/llog_cat.c
+++ b/
lustre/obdclass/llog_cat.c
@@
-44,10
+44,6
@@
#define DEBUG_SUBSYSTEM S_LOG
#define DEBUG_SUBSYSTEM S_LOG
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
#ifndef __KERNEL__
#include <liblustre.h>
#endif
#ifndef __KERNEL__
#include <liblustre.h>
#endif
@@
-95,13
+91,18
@@
static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
if (index == 0)
index = 1;
if (index == 0)
index = 1;
+
+ cfs_spin_lock(&loghandle->lgh_hdr_lock);
+ llh->llh_count++;
if (ext2_set_bit(index, llh->llh_bitmap)) {
CERROR("argh, index %u already set in log bitmap?\n",
index);
if (ext2_set_bit(index, llh->llh_bitmap)) {
CERROR("argh, index %u already set in log bitmap?\n",
index);
+ cfs_spin_unlock(&loghandle->lgh_hdr_lock);
LBUG(); /* should never happen */
}
LBUG(); /* should never happen */
}
+ cfs_spin_unlock(&loghandle->lgh_hdr_lock);
+
cathandle->lgh_last_idx = index;
cathandle->lgh_last_idx = index;
- llh->llh_count++;
llh->llh_tail.lrt_index = index;
CDEBUG(D_RPCTRACE,"new recovery log "LPX64":%x for index %u of catalog "
llh->llh_tail.lrt_index = index;
CDEBUG(D_RPCTRACE,"new recovery log "LPX64":%x for index %u of catalog "
@@
-489,7
+490,7
@@
int llog_cat_process_thread(void *data)
/*
* Make sure that all cached data is sent.
*/
/*
* Make sure that all cached data is sent.
*/
-
llog_sync(ctxt, NULL
);
+
llog_sync(ctxt, NULL, 0
);
GOTO(release_llh, rc);
release_llh:
rc = llog_cat_put(llh);
GOTO(release_llh, rc);
release_llh:
rc = llog_cat_put(llh);