-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#define DEBUG_SUBSYSTEM S_FILTER
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/module.h>
#include <linux/version.h>
struct ost_filterdata *ofd;
ENTRY;
- LOCK_INODE_MUTEX(inode);
- ofd = INODE_PRIVATE_DATA(inode);
-
- if (ofd && ofd->ofd_epoch >= ioepoch) {
- if (ofd->ofd_epoch > ioepoch)
- CERROR("client sent old epoch %d for obj ino %ld\n",
- ioepoch, inode->i_ino);
- UNLOCK_INODE_MUTEX(inode);
- RETURN(0);
- }
-
- if (ofd && ofd->ofd_epoch < ioepoch) {
- ofd->ofd_epoch = ioepoch;
- } else if (!ofd) {
- OBD_ALLOC(ofd, sizeof(*ofd));
- if (!ofd)
- GOTO(out, rc = -ENOMEM);
- igrab(inode);
- INODE_PRIVATE_DATA(inode) = ofd;
- ofd->ofd_epoch = ioepoch;
- }
- /* the decision to write a record is now made, unlock */
- UNLOCK_INODE_MUTEX(inode);
+ mutex_lock(&inode->i_mutex);
+ ofd = inode->i_private;
+
+ if (ofd && ofd->ofd_epoch >= ioepoch) {
+ if (ofd->ofd_epoch > ioepoch)
+ CERROR("client sent old epoch %d for obj ino %ld\n",
+ ioepoch, inode->i_ino);
+ mutex_unlock(&inode->i_mutex);
+ RETURN(0);
+ }
+
+ if (ofd && ofd->ofd_epoch < ioepoch) {
+ ofd->ofd_epoch = ioepoch;
+ } else if (!ofd) {
+ OBD_ALLOC(ofd, sizeof(*ofd));
+ if (!ofd)
+ GOTO(out, rc = -ENOMEM);
+ igrab(inode);
+ inode->i_private = ofd;
+ ofd->ofd_epoch = ioepoch;
+ }
+ /* the decision to write a record is now made, unlock */
+ mutex_unlock(&inode->i_mutex);
OBD_ALLOC(lsc, sizeof(*lsc));
if (lsc == NULL)
lsc->lsc_fid = *mds_fid;
lsc->lsc_ioepoch = ioepoch;
- rc = llog_cat_add_rec(cathandle, &lsc->lsc_hdr, logcookie, NULL);
+ rc = llog_cat_add_rec(NULL, cathandle, &lsc->lsc_hdr, logcookie, NULL);
OBD_FREE(lsc, sizeof(*lsc));
if (rc > 0) {
OBD_FAIL_TIMEOUT(OBD_FAIL_OST_CANCEL_COOKIE_TIMEOUT, 30);
- rc = llog_cancel(ctxt, NULL, 1, cookie, 0);
+ rc = llog_cancel(NULL, ctxt, NULL, 1, cookie, 0);
if (rc)
CERROR("error cancelling log cookies: rc = %d\n", rc);
llog_ctxt_put(ctxt);
}
while (count > 0) {
- rc = filter_destroy(exp, oa, NULL, NULL, NULL, NULL);
+ rc = filter_destroy(NULL, exp, oa, NULL, NULL, NULL, NULL);
if (rc == 0)
CDEBUG(D_RPCTRACE, "object "LPU64" is destroyed\n",
oid);
if (oinfo.oi_oa == NULL)
RETURN(-ENOMEM);
- if (rec->lrh_type == MDS_SETATTR_REC) {
- struct llog_setattr_rec *lsr = (struct llog_setattr_rec *)rec;
-
- oinfo.oi_oa->o_id = lsr->lsr_oid;
- oinfo.oi_oa->o_seq = lsr->lsr_oseq;
- oinfo.oi_oa->o_uid = lsr->lsr_uid;
- oinfo.oi_oa->o_gid = lsr->lsr_gid;
- } else {
+ if (rec->lrh_type == MDS_SETATTR64_REC) {
struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec;
oinfo.oi_oa->o_id = lsr->lsr_oid;
oinfo.oi_oa->o_seq = lsr->lsr_oseq;
oinfo.oi_oa->o_uid = lsr->lsr_uid;
oinfo.oi_oa->o_gid = lsr->lsr_gid;
- }
+ } else {
+ CERROR("%s: wrong llog type %#x\n", obd->obd_name,
+ rec->lrh_type);
+ RETURN(-EINVAL);
+ }
oinfo.oi_oa->o_valid |= (OBD_MD_FLID | OBD_MD_FLUID | OBD_MD_FLGID |
OBD_MD_FLCOOKIE);
oinfo.oi_oa->o_lcookie = *cookie;
oid = oinfo.oi_oa->o_id;
- rc = filter_setattr(exp, &oinfo, NULL);
+ rc = filter_setattr(NULL, exp, &oinfo, NULL);
OBDO_FREE(oinfo.oi_oa);
if (rc == -ENOENT) {
CDEBUG(D_RPCTRACE, "object already removed, send cookie\n");
- llog_cancel(ctxt, NULL, 1, cookie, 0);
+ llog_cancel(NULL, ctxt, NULL, 1, cookie, 0);
RETURN(0);
}
RETURN(rc);
}
-int filter_recov_log_mds_ost_cb(struct llog_handle *llh,
- struct llog_rec_hdr *rec, void *data)
+int filter_recov_log_mds_ost_cb(const struct lu_env *env,
+ struct llog_handle *llh,
+ struct llog_rec_hdr *rec, void *data)
{
struct llog_ctxt *ctxt = llh->lgh_ctxt;
struct llog_cookie cookie;
case MDS_UNLINK_REC:
rc = filter_recov_log_unlink_cb(ctxt, rec, &cookie);
break;
- case MDS_SETATTR_REC:
case MDS_SETATTR64_REC:
rc = filter_recov_log_setattr_cb(ctxt, rec, &cookie);
break;
case LLOG_GEN_REC: {
struct llog_gen_rec *lgr = (struct llog_gen_rec *)rec;
+
if (llog_gen_lt(lgr->lgr_gen, ctxt->loc_gen))
rc = 0;
else
rc = LLOG_PROC_BREAK;
CDEBUG(D_HA, "fetch generation log, send cookie\n");
- llog_cancel(ctxt, NULL, 1, &cookie, 0);
+ llog_cancel(NULL, ctxt, NULL, 1, &cookie, 0);
RETURN(rc);
}
break;