X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_lvfs.c;h=a83cb6f425e44e86ae9250fccd09b97ceb14dccd;hb=9c6ebfd11be1cc11629a2960c8c818492e1f0980;hp=cba0de9dee0c8b9b68f797256ad2805b030afff9;hpb=3925b3aa87aede47531fdf632e55bfdfb8947957;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_lvfs.c b/lustre/obdclass/llog_lvfs.c index cba0de9..a83cb6f 100644 --- a/lustre/obdclass/llog_lvfs.c +++ b/lustre/obdclass/llog_lvfs.c @@ -26,6 +26,8 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -159,7 +161,8 @@ static int llog_lvfs_read_blob(struct obd_device *obd, struct l_file *file, RETURN(0); } -static int llog_lvfs_read_header(struct llog_handle *handle) +static int llog_lvfs_read_header(const struct lu_env *env, + struct llog_handle *handle) { struct obd_device *obd; int rc; @@ -211,10 +214,11 @@ static int llog_lvfs_read_header(struct llog_handle *handle) /* returns negative in on error; 0 if success && reccookie == 0; 1 otherwise */ /* appends if idx == -1, otherwise overwrites record idx. */ -static int llog_lvfs_write_rec(struct llog_handle *loghandle, - struct llog_rec_hdr *rec, - struct llog_cookie *reccookie, int cookiecount, - void *buf, int idx) +static int llog_lvfs_write_rec(const struct lu_env *env, + struct llog_handle *loghandle, + struct llog_rec_hdr *rec, + struct llog_cookie *reccookie, int cookiecount, + void *buf, int idx, struct thandle *th) { struct llog_log_hdr *llh; int reclen = rec->lrh_len, index, rc; @@ -264,18 +268,13 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle, if (rc || idx == 0) RETURN(rc); - /* Assumes constant lrh_len */ - saved_offset = sizeof(*llh) + (idx - 1) * reclen; - if (buf) { - struct llog_rec_hdr check; - /* We assume that caller has set lgh_cur_* */ saved_offset = loghandle->lgh_cur_offset; CDEBUG(D_OTHER, - "modify record "LPX64": idx:%d/%u/%d, len:%u " + "modify record "DOSTID": idx:%d/%u/%d, len:%u " "offset %llu\n", - loghandle->lgh_id.lgl_oid, idx, rec->lrh_index, + POSTID(&loghandle->lgh_id.lgl_oi), idx, rec->lrh_index, loghandle->lgh_cur_idx, rec->lrh_len, (long long)(saved_offset - sizeof(*llh))); if (rec->lrh_index != loghandle->lgh_cur_idx) { @@ -283,19 +282,10 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle, idx, loghandle->lgh_cur_idx); RETURN(-EFAULT); } -#if 1 /* FIXME remove this safety check at some point */ - /* Verify that the record we're modifying is the - right one. */ - rc = llog_lvfs_read_blob(obd, file, &check, - sizeof(check), saved_offset); - if (check.lrh_index != idx || check.lrh_len != reclen) { - CERROR("Bad modify idx %u/%u size %u/%u (%d)\n", - idx, check.lrh_index, reclen, - check.lrh_len, rc); - RETURN(-EFAULT); - } -#endif - } + } else { + /* Assumes constant lrh_len */ + saved_offset = sizeof(*llh) + (idx - 1) * reclen; + } rc = llog_lvfs_write_blob(obd, file, rec, buf, saved_offset); if (rc == 0 && reccookie) { @@ -340,11 +330,14 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle, /*The caller should make sure only 1 process access the lgh_last_idx, *Otherwise it might hit the assert.*/ LASSERT(index < LLOG_BITMAP_SIZE(llh)); - if (ext2_set_bit(index, llh->llh_bitmap)) { - CERROR("argh, index %u already set in log bitmap?\n", index); - LBUG(); /* should never happen */ - } - llh->llh_count++; + spin_lock(&loghandle->lgh_hdr_lock); + if (ext2_set_bit(index, llh->llh_bitmap)) { + CERROR("argh, index %u already set in log bitmap?\n", index); + spin_unlock(&loghandle->lgh_hdr_lock); + LBUG(); /* should never happen */ + } + llh->llh_count++; + spin_unlock(&loghandle->lgh_hdr_lock); llh->llh_tail.lrt_index = index; rc = llog_lvfs_write_blob(obd, file, &llh->llh_hdr, NULL, 0); @@ -355,8 +348,8 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle, if (rc) RETURN(rc); - CDEBUG(D_RPCTRACE, "added record "LPX64": idx: %u, %u \n", - loghandle->lgh_id.lgl_oid, index, rec->lrh_len); + CDEBUG(D_RPCTRACE, "added record "DOSTID": idx: %u, %u \n", + POSTID(&loghandle->lgh_id.lgl_oi), index, rec->lrh_len); if (rc == 0 && reccookie) { reccookie->lgc_lgl = loghandle->lgh_id; reccookie->lgc_index = index; @@ -395,9 +388,10 @@ static void llog_skip_over(__u64 *off, int curr, int goal) * - cur_idx to the log index preceeding cur_offset * returns -EIO/-EINVAL on error */ -static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, - int next_idx, __u64 *cur_offset, void *buf, - int len) +static int llog_lvfs_next_block(const struct lu_env *env, + struct llog_handle *loghandle, int *cur_idx, + int next_idx, __u64 *cur_offset, void *buf, + int len) { int rc; ENTRY; @@ -409,29 +403,30 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, next_idx, *cur_idx, *cur_offset); while (*cur_offset < i_size_read(loghandle->lgh_file->f_dentry->d_inode)) { - struct llog_rec_hdr *rec; - struct llog_rec_tail *tail; - loff_t ppos; - - llog_skip_over(cur_offset, *cur_idx, next_idx); - - ppos = *cur_offset; - rc = fsfilt_read_record(loghandle->lgh_ctxt->loc_exp->exp_obd, - loghandle->lgh_file, buf, len, - &ppos); - if (rc) { - CERROR("Cant read llog block at log id "LPU64 - "/%u offset "LPU64"\n", - loghandle->lgh_id.lgl_oid, - loghandle->lgh_id.lgl_ogen, - *cur_offset); - RETURN(rc); - } + struct llog_rec_hdr *rec, *last_rec; + struct llog_rec_tail *tail; + loff_t ppos; + int llen; + + llog_skip_over(cur_offset, *cur_idx, next_idx); + + /* read up to next LLOG_CHUNK_SIZE block */ + ppos = *cur_offset; + llen = LLOG_CHUNK_SIZE - (*cur_offset & (LLOG_CHUNK_SIZE - 1)); + rc = fsfilt_read_record(loghandle->lgh_ctxt->loc_exp->exp_obd, + loghandle->lgh_file, buf, llen, + cur_offset); + if (rc < 0) { + CERROR("Cant read llog block at log id "DOSTID + "/%u offset "LPU64"\n", + POSTID(&loghandle->lgh_id.lgl_oi), + loghandle->lgh_id.lgl_ogen, + *cur_offset); + RETURN(rc); + } /* put number of bytes read into rc to make code simpler */ - rc = ppos - *cur_offset; - *cur_offset = ppos; - + rc = *cur_offset - ppos; if (rc < len) { /* signal the end of the valid buffer to llog_process */ memset(buf + rc, 0, len - rc); @@ -440,29 +435,37 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, if (rc == 0) /* end of file, nothing to do */ RETURN(0); - if (rc < sizeof(*tail)) { - CERROR("Invalid llog block at log id "LPU64"/%u offset " - LPU64"\n", loghandle->lgh_id.lgl_oid, - loghandle->lgh_id.lgl_ogen, *cur_offset); - RETURN(-EINVAL); - } + if (rc < sizeof(*tail)) { + CERROR("Invalid llog block at log id "DOSTID"/%u offset" + LPU64"\n", POSTID(&loghandle->lgh_id.lgl_oi), + loghandle->lgh_id.lgl_ogen, *cur_offset); + RETURN(-EINVAL); + } rec = buf; - tail = (struct llog_rec_tail *)((char *)buf + rc - - sizeof(struct llog_rec_tail)); - if (LLOG_REC_HDR_NEEDS_SWABBING(rec)) lustre_swab_llog_rec(rec); + tail = (struct llog_rec_tail *)(buf + rc - + sizeof(struct llog_rec_tail)); + + /* get the last record in block */ + last_rec = (struct llog_rec_hdr *)(buf + rc - + le32_to_cpu(tail->lrt_len)); + + if (LLOG_REC_HDR_NEEDS_SWABBING(last_rec)) + lustre_swab_llog_rec(last_rec); + LASSERT(last_rec->lrh_index == tail->lrt_index); + *cur_idx = tail->lrt_index; - /* this shouldn't happen */ - if (tail->lrt_index == 0) { - CERROR("Invalid llog tail at log id "LPU64"/%u offset " - LPU64"\n", loghandle->lgh_id.lgl_oid, - loghandle->lgh_id.lgl_ogen, *cur_offset); - RETURN(-EINVAL); - } + /* this shouldn't happen */ + if (tail->lrt_index == 0) { + CERROR("Invalid llog tail at log id "DOSTID"/%u offset " + LPU64"\n", POSTID(&loghandle->lgh_id.lgl_oi), + loghandle->lgh_id.lgl_ogen, *cur_offset); + RETURN(-EINVAL); + } if (tail->lrt_index < next_idx) continue; @@ -478,8 +481,9 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, RETURN(-EIO); } -static int llog_lvfs_prev_block(struct llog_handle *loghandle, - int prev_idx, void *buf, int len) +static int llog_lvfs_prev_block(const struct lu_env *env, + struct llog_handle *loghandle, + int prev_idx, void *buf, int len) { __u64 cur_offset; int rc; @@ -494,56 +498,65 @@ static int llog_lvfs_prev_block(struct llog_handle *loghandle, llog_skip_over(&cur_offset, 0, prev_idx); while (cur_offset < i_size_read(loghandle->lgh_file->f_dentry->d_inode)) { - struct llog_rec_hdr *rec; - struct llog_rec_tail *tail; - loff_t ppos; - - ppos = cur_offset; - - rc = fsfilt_read_record(loghandle->lgh_ctxt->loc_exp->exp_obd, - loghandle->lgh_file, buf, len, - &ppos); - if (rc) { - CERROR("Cant read llog block at log id "LPU64 - "/%u offset "LPU64"\n", - loghandle->lgh_id.lgl_oid, - loghandle->lgh_id.lgl_ogen, - cur_offset); - RETURN(rc); - } + struct llog_rec_hdr *rec, *last_rec; + struct llog_rec_tail *tail; + loff_t ppos = cur_offset; + + rc = fsfilt_read_record(loghandle->lgh_ctxt->loc_exp->exp_obd, + loghandle->lgh_file, buf, len, + &cur_offset); + if (rc < 0) { + CERROR("Cant read llog block at log id "DOSTID + "/%u offset "LPU64"\n", + POSTID(&loghandle->lgh_id.lgl_oi), + loghandle->lgh_id.lgl_ogen, + cur_offset); + RETURN(rc); + } /* put number of bytes read into rc to make code simpler */ - rc = ppos - cur_offset; - cur_offset = ppos; + rc = cur_offset - ppos; if (rc == 0) /* end of file, nothing to do */ RETURN(0); if (rc < sizeof(*tail)) { - CERROR("Invalid llog block at log id "LPU64"/%u offset " - LPU64"\n", loghandle->lgh_id.lgl_oid, + CERROR("Invalid llog block at log id "DOSTID"/%u offset" + LPU64"\n", POSTID(&loghandle->lgh_id.lgl_oi), loghandle->lgh_id.lgl_ogen, cur_offset); RETURN(-EINVAL); } - tail = buf + rc - sizeof(struct llog_rec_tail); + rec = buf; + if (LLOG_REC_HDR_NEEDS_SWABBING(rec)) + lustre_swab_llog_rec(rec); - /* this shouldn't happen */ - if (tail->lrt_index == 0) { - CERROR("Invalid llog tail at log id "LPU64"/%u offset " - LPU64"\n", loghandle->lgh_id.lgl_oid, - loghandle->lgh_id.lgl_ogen, cur_offset); - RETURN(-EINVAL); - } - if (le32_to_cpu(tail->lrt_index) < prev_idx) + tail = (struct llog_rec_tail *)(buf + rc - + sizeof(struct llog_rec_tail)); + + /* get the last record in block */ + last_rec = (struct llog_rec_hdr *)(buf + rc - + le32_to_cpu(tail->lrt_len)); + + if (LLOG_REC_HDR_NEEDS_SWABBING(last_rec)) + lustre_swab_llog_rec(last_rec); + LASSERT(last_rec->lrh_index == tail->lrt_index); + + /* this shouldn't happen */ + if (tail->lrt_index == 0) { + CERROR("Invalid llog tail at log id "DOSTID"/%u offset" + LPU64"\n", POSTID(&loghandle->lgh_id.lgl_oi), + loghandle->lgh_id.lgl_ogen, cur_offset); + RETURN(-EINVAL); + } + if (tail->lrt_index < prev_idx) continue; /* sanity check that the start of the new buffer is no farther * than the record that we wanted. This shouldn't happen. */ - rec = buf; - if (le32_to_cpu(rec->lrh_index) > prev_idx) { - CERROR("missed desired record? %u > %u\n", - le32_to_cpu(rec->lrh_index), prev_idx); + if (rec->lrh_index > prev_idx) { + CERROR("missed desired record? %u > %u\n", + rec->lrh_index, prev_idx); RETURN(-ENOENT); } RETURN(0); @@ -566,7 +579,7 @@ static struct file *llog_filp_open(char *dir, char *name, int flags, int mode) filp = ERR_PTR(-ENAMETOOLONG); } else { filp = l_filp_open(logname, flags, mode); - if (IS_ERR(filp)) + if (IS_ERR(filp) && PTR_ERR(filp) != -ENOENT) CERROR("logfile creation %s: %ld\n", logname, PTR_ERR(filp)); } @@ -574,125 +587,186 @@ static struct file *llog_filp_open(char *dir, char *name, int flags, int mode) return filp; } -/* This is a callback from the llog_* functions. - * Assumes caller has already pushed us into the kernel context. */ -static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res, - struct llog_logid *logid, char *name) +static int llog_lvfs_open(const struct lu_env *env, struct llog_handle *handle, + struct llog_logid *logid, char *name, + enum llog_open_param open_param) { - struct llog_handle *handle; - struct obd_device *obd; - struct l_dentry *dchild = NULL; - struct obdo *oa = NULL; - int rc = 0; - int open_flags = O_RDWR | O_CREAT | O_LARGEFILE; - ENTRY; - - handle = llog_alloc_handle(); - if (handle == NULL) - RETURN(-ENOMEM); - *res = handle; - - LASSERT(ctxt); - LASSERT(ctxt->loc_exp); - obd = ctxt->loc_exp->exp_obd; - - if (logid != NULL) { - dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, logid->lgl_oid, - logid->lgl_ogen, logid->lgl_oseq); - - if (IS_ERR(dchild)) { - rc = PTR_ERR(dchild); - CERROR("error looking up logfile "LPX64":0x%x: rc %d\n", - logid->lgl_oid, logid->lgl_ogen, rc); - GOTO(out, rc); - } - - if (dchild->d_inode == NULL) { - l_dput(dchild); - rc = -ENOENT; - CERROR("nonexistent log file "LPX64":"LPX64": rc %d\n", - logid->lgl_oid, logid->lgl_oseq, rc); - GOTO(out, rc); - } - - /* l_dentry_open will call dput(dchild) if there is an error */ - handle->lgh_file = l_dentry_open(&obd->obd_lvfs_ctxt, dchild, - O_RDWR | O_LARGEFILE); - if (IS_ERR(handle->lgh_file)) { - rc = PTR_ERR(handle->lgh_file); - CERROR("error opening logfile "LPX64"0x%x: rc %d\n", - logid->lgl_oid, logid->lgl_ogen, rc); - GOTO(out, rc); - } - - /* assign the value of lgh_id for handle directly */ - handle->lgh_id = *logid; - - } else if (name) { - handle->lgh_file = llog_filp_open(MOUNT_CONFIGS_DIR, - name, open_flags, 0644); - if (IS_ERR(handle->lgh_file)) - GOTO(out, rc = PTR_ERR(handle->lgh_file)); - - handle->lgh_id.lgl_oseq = 1; - handle->lgh_id.lgl_oid = - handle->lgh_file->f_dentry->d_inode->i_ino; - handle->lgh_id.lgl_ogen = - handle->lgh_file->f_dentry->d_inode->i_generation; - } else { - OBDO_ALLOC(oa); - if (oa == NULL) - GOTO(out, rc = -ENOMEM); - - oa->o_seq = FID_SEQ_LLOG; - oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLGROUP; + struct llog_ctxt *ctxt = handle->lgh_ctxt; + struct l_dentry *dchild = NULL; + struct obd_device *obd; + int rc = 0; + + ENTRY; + + LASSERT(ctxt); + LASSERT(ctxt->loc_exp); + LASSERT(ctxt->loc_exp->exp_obd); + obd = ctxt->loc_exp->exp_obd; + + LASSERT(handle); + if (logid != NULL) { + dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, &logid->lgl_oi, + logid->lgl_ogen); + if (IS_ERR(dchild)) { + rc = PTR_ERR(dchild); + CERROR("%s: error looking up logfile #"DOSTID "#%08x:" + " rc = %d\n", ctxt->loc_obd->obd_name, + POSTID(&logid->lgl_oi), logid->lgl_ogen, rc); + GOTO(out, rc); + } + if (dchild->d_inode == NULL) { + l_dput(dchild); + rc = -ENOENT; + CERROR("%s: nonexistent llog #"DOSTID"#%08x:" + "rc = %d\n", ctxt->loc_obd->obd_name, + POSTID(&logid->lgl_oi), logid->lgl_ogen, rc); + GOTO(out, rc); + } + handle->lgh_file = l_dentry_open(&obd->obd_lvfs_ctxt, dchild, + O_RDWR | O_LARGEFILE); + l_dput(dchild); + if (IS_ERR(handle->lgh_file)) { + rc = PTR_ERR(handle->lgh_file); + handle->lgh_file = NULL; + CERROR("%s: error opening llog #"DOSTID"#%08x:" + "rc = %d\n", ctxt->loc_obd->obd_name, + POSTID(&logid->lgl_oi), logid->lgl_ogen, rc); + GOTO(out, rc); + } + handle->lgh_id = *logid; + } else if (name) { + handle->lgh_file = llog_filp_open(MOUNT_CONFIGS_DIR, name, + O_RDWR | O_LARGEFILE, 0644); + if (IS_ERR(handle->lgh_file)) { + rc = PTR_ERR(handle->lgh_file); + handle->lgh_file = NULL; + if (rc == -ENOENT && open_param == LLOG_OPEN_NEW) { + OBD_ALLOC(handle->lgh_name, strlen(name) + 1); + if (handle->lgh_name) + strcpy(handle->lgh_name, name); + else + GOTO(out, rc = -ENOMEM); + rc = 0; + } else { + GOTO(out, rc); + } + } else { + lustre_build_llog_lvfs_oid(&handle->lgh_id, + handle->lgh_file->f_dentry->d_inode->i_ino, + handle->lgh_file->f_dentry->d_inode->i_generation); + } + } else { + LASSERTF(open_param == LLOG_OPEN_NEW, "%#x\n", open_param); + handle->lgh_file = NULL; + } + + /* No new llog is expected but doesn't exist */ + if (open_param != LLOG_OPEN_NEW && handle->lgh_file == NULL) + GOTO(out_name, rc = -ENOENT); + + RETURN(0); +out_name: + if (handle->lgh_name != NULL) + OBD_FREE(handle->lgh_name, strlen(name) + 1); +out: + RETURN(rc); +} - rc = obd_create(NULL, ctxt->loc_exp, oa, NULL, NULL); - if (rc) - GOTO(out, rc); +static int llog_lvfs_exist(struct llog_handle *handle) +{ + return (handle->lgh_file != NULL); +} - /* FIXME: rationalize the misuse of o_generation in - * this API along with mds_obd_{create,destroy}. - * Hopefully it is only an internal API issue. */ +/* This is a callback from the llog_* functions. + * Assumes caller has already pushed us into the kernel context. */ +static int llog_lvfs_create(const struct lu_env *env, + struct llog_handle *handle, + struct thandle *th) +{ + struct llog_ctxt *ctxt = handle->lgh_ctxt; + struct obd_device *obd; + struct l_dentry *dchild = NULL; + struct file *file; + struct obdo *oa = NULL; + int rc = 0; + int open_flags = O_RDWR | O_CREAT | O_LARGEFILE; + + ENTRY; + + LASSERT(ctxt); + LASSERT(ctxt->loc_exp); + obd = ctxt->loc_exp->exp_obd; + LASSERT(handle->lgh_file == NULL); + + if (handle->lgh_name) { + file = llog_filp_open(MOUNT_CONFIGS_DIR, handle->lgh_name, + open_flags, 0644); + if (IS_ERR(file)) + RETURN(PTR_ERR(file)); + + lustre_build_llog_lvfs_oid(&handle->lgh_id, + file->f_dentry->d_inode->i_ino, + file->f_dentry->d_inode->i_generation); + handle->lgh_file = file; + } else { + OBDO_ALLOC(oa); + if (oa == NULL) + RETURN(-ENOMEM); + + ostid_set_seq_llog(&oa->o_oi); + oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLGROUP; + + rc = obd_create(NULL, ctxt->loc_exp, oa, NULL, NULL); + if (rc) + GOTO(out, rc); + + /* FIXME: rationalize the misuse of o_generation in + * this API along with mds_obd_{create,destroy}. + * Hopefully it is only an internal API issue. */ #define o_generation o_parent_oid - dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, oa->o_id, - oa->o_generation, oa->o_seq); - - if (IS_ERR(dchild)) - GOTO(out, rc = PTR_ERR(dchild)); - - handle->lgh_file = l_dentry_open(&obd->obd_lvfs_ctxt, dchild, - open_flags); - if (IS_ERR(handle->lgh_file)) - GOTO(out, rc = PTR_ERR(handle->lgh_file)); - - handle->lgh_id.lgl_oseq = oa->o_seq; - handle->lgh_id.lgl_oid = oa->o_id; - handle->lgh_id.lgl_ogen = oa->o_generation; - } - - handle->lgh_ctxt = ctxt; + dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, &oa->o_oi, + oa->o_generation); + if (IS_ERR(dchild)) + GOTO(out, rc = PTR_ERR(dchild)); + + file = l_dentry_open(&obd->obd_lvfs_ctxt, dchild, open_flags); + l_dput(dchild); + if (IS_ERR(file)) + GOTO(out, rc = PTR_ERR(file)); + handle->lgh_id.lgl_oi = oa->o_oi; + handle->lgh_id.lgl_ogen = oa->o_generation; + handle->lgh_file = file; out: - if (rc) - llog_free_handle(handle); - - if (oa) - OBDO_FREE(oa); - RETURN(rc); + OBDO_FREE(oa); + } + RETURN(rc); } -static int llog_lvfs_close(struct llog_handle *handle) +static int llog_lvfs_close(const struct lu_env *env, + struct llog_handle *handle) { - int rc; - ENTRY; - - rc = filp_close(handle->lgh_file, 0); - if (rc) - CERROR("error closing log: rc %d\n", rc); - RETURN(rc); + int rc; + + ENTRY; + + if (handle->lgh_file == NULL) + RETURN(0); + rc = filp_close(handle->lgh_file, 0); + if (rc) + CERROR("%s: error closing llog #"DOSTID"#%08x: " + "rc = %d\n", handle->lgh_ctxt->loc_obd->obd_name, + POSTID(&handle->lgh_id.lgl_oi), + handle->lgh_id.lgl_ogen, rc); + handle->lgh_file = NULL; + if (handle->lgh_name) { + OBD_FREE(handle->lgh_name, strlen(handle->lgh_name) + 1); + handle->lgh_name = NULL; + } + RETURN(rc); } -static int llog_lvfs_destroy(struct llog_handle *handle) +static int llog_lvfs_destroy(const struct lu_env *env, + struct llog_handle *handle) { struct dentry *fdentry; struct obdo *oa; @@ -705,6 +779,7 @@ static int llog_lvfs_destroy(struct llog_handle *handle) dir = MOUNT_CONFIGS_DIR; + LASSERT(handle->lgh_file); fdentry = handle->lgh_file->f_dentry; inode = fdentry->d_parent->d_inode; if (strcmp(fdentry->d_parent->d_name.name, dir) == 0) { @@ -713,8 +788,7 @@ static int llog_lvfs_destroy(struct llog_handle *handle) push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); dget(fdentry); - rc = llog_lvfs_close(handle); - + rc = llog_lvfs_close(env, handle); if (rc == 0) { mutex_lock_nested(&inode->i_mutex, I_MUTEX_PARENT); rc = ll_vfs_unlink(inode, fdentry, mnt); @@ -731,13 +805,12 @@ static int llog_lvfs_destroy(struct llog_handle *handle) if (oa == NULL) RETURN(-ENOMEM); - oa->o_id = handle->lgh_id.lgl_oid; - oa->o_seq = handle->lgh_id.lgl_oseq; - oa->o_generation = handle->lgh_id.lgl_ogen; + oa->o_oi = handle->lgh_id.lgl_oi; + oa->o_generation = handle->lgh_id.lgl_ogen; #undef o_generation oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP | OBD_MD_FLGENER; - rc = llog_lvfs_close(handle); + rc = llog_lvfs_close(env, handle); if (rc) GOTO(out, rc); @@ -758,193 +831,35 @@ static int llog_lvfs_destroy(struct llog_handle *handle) RETURN(rc); } -/* reads the catalog list */ -int llog_get_cat_list(struct obd_device *disk_obd, - char *name, int idx, int count, struct llog_catid *idarray) +static int llog_lvfs_declare_create(const struct lu_env *env, + struct llog_handle *res, + struct thandle *th) { - struct lvfs_run_ctxt saved; - struct l_file *file; - int rc, rc1 = 0; - int size = sizeof(*idarray) * count; - loff_t off = idx * sizeof(*idarray); - ENTRY; - - if (!count) - RETURN(0); - - push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - file = filp_open(name, O_RDWR | O_CREAT | O_LARGEFILE, 0700); - if (!file || IS_ERR(file)) { - rc = PTR_ERR(file); - CERROR("OBD filter: cannot open/create %s: rc = %d\n", - name, rc); - GOTO(out, rc); - } - - if (!S_ISREG(file->f_dentry->d_inode->i_mode)) { - CERROR("%s is not a regular file!: mode = %o\n", name, - file->f_dentry->d_inode->i_mode); - GOTO(out, rc = -ENOENT); - } - - CDEBUG(D_CONFIG, "cat list: disk size=%d, read=%d\n", - (int)i_size_read(file->f_dentry->d_inode), size); - - /* read for new ost index or for empty file */ - memset(idarray, 0, size); - if (i_size_read(file->f_dentry->d_inode) < off) - GOTO(out, rc = 0); - - rc = fsfilt_read_record(disk_obd, file, idarray, size, &off); - if (rc) { - CERROR("OBD filter: error reading %s: rc %d\n", name, rc); - GOTO(out, rc); - } - - EXIT; - out: - pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - if (file && !IS_ERR(file)) - rc1 = filp_close(file, 0); - if (rc == 0) - rc = rc1; - return rc; + return 0; } -EXPORT_SYMBOL(llog_get_cat_list); -/* writes the cat list */ -int llog_put_cat_list(struct obd_device *disk_obd, - char *name, int idx, int count, struct llog_catid *idarray) +static int llog_lvfs_declare_write_rec(const struct lu_env *env, + struct llog_handle *loghandle, + struct llog_rec_hdr *rec, + int idx, struct thandle *th) { - struct lvfs_run_ctxt saved; - struct l_file *file; - int rc, rc1 = 0; - int size = sizeof(*idarray) * count; - loff_t off = idx * sizeof(*idarray); - - if (!count) - GOTO(out1, rc = 0); - - push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - file = filp_open(name, O_RDWR | O_CREAT | O_LARGEFILE, 0700); - if (!file || IS_ERR(file)) { - rc = PTR_ERR(file); - CERROR("OBD filter: cannot open/create %s: rc = %d\n", - name, rc); - GOTO(out, rc); - } - - if (!S_ISREG(file->f_dentry->d_inode->i_mode)) { - CERROR("%s is not a regular file!: mode = %o\n", name, - file->f_dentry->d_inode->i_mode); - GOTO(out, rc = -ENOENT); - } - - rc = fsfilt_write_record(disk_obd, file, idarray, size, &off, 1); - if (rc) { - CDEBUG(D_INODE,"OBD filter: error writeing %s: rc %d\n", - name, rc); - GOTO(out, rc); - } - -out: - pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - if (file && !IS_ERR(file)) - rc1 = filp_close(file, 0); - - if (rc == 0) - rc = rc1; -out1: - RETURN(rc); + return 0; } -EXPORT_SYMBOL(llog_put_cat_list); struct llog_operations llog_lvfs_ops = { - lop_write_rec: llog_lvfs_write_rec, - lop_next_block: llog_lvfs_next_block, - lop_prev_block: llog_lvfs_prev_block, - lop_read_header: llog_lvfs_read_header, - lop_create: llog_lvfs_create, - lop_destroy: llog_lvfs_destroy, - lop_close: llog_lvfs_close, - // lop_cancel: llog_lvfs_cancel, + .lop_write_rec = llog_lvfs_write_rec, + .lop_next_block = llog_lvfs_next_block, + .lop_prev_block = llog_lvfs_prev_block, + .lop_read_header = llog_lvfs_read_header, + .lop_create = llog_lvfs_create, + .lop_destroy = llog_lvfs_destroy, + .lop_close = llog_lvfs_close, + .lop_open = llog_lvfs_open, + .lop_exist = llog_lvfs_exist, + .lop_declare_create = llog_lvfs_declare_create, + .lop_declare_write_rec = llog_lvfs_declare_write_rec, }; - EXPORT_SYMBOL(llog_lvfs_ops); - #else /* !__KERNEL__ */ - -static int llog_lvfs_read_header(struct llog_handle *handle) -{ - LBUG(); - return 0; -} - -static int llog_lvfs_write_rec(struct llog_handle *loghandle, - struct llog_rec_hdr *rec, - struct llog_cookie *reccookie, int cookiecount, - void *buf, int idx) -{ - LBUG(); - return 0; -} - -static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, - int next_idx, __u64 *cur_offset, void *buf, - int len) -{ - LBUG(); - return 0; -} - -static int llog_lvfs_prev_block(struct llog_handle *loghandle, - int prev_idx, void *buf, int len) -{ - LBUG(); - return 0; -} - -static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res, - struct llog_logid *logid, char *name) -{ - LBUG(); - return 0; -} - -static int llog_lvfs_close(struct llog_handle *handle) -{ - LBUG(); - return 0; -} - -static int llog_lvfs_destroy(struct llog_handle *handle) -{ - LBUG(); - return 0; -} - -int llog_get_cat_list(struct obd_device *disk_obd, - char *name, int idx, int count, struct llog_catid *idarray) -{ - LBUG(); - return 0; -} - -int llog_put_cat_list(struct obd_device *disk_obd, - char *name, int idx, int count, struct llog_catid *idarray) -{ - LBUG(); - return 0; -} - -struct llog_operations llog_lvfs_ops = { - lop_write_rec: llog_lvfs_write_rec, - lop_next_block: llog_lvfs_next_block, - lop_prev_block: llog_lvfs_prev_block, - lop_read_header: llog_lvfs_read_header, - lop_create: llog_lvfs_create, - lop_destroy: llog_lvfs_destroy, - lop_close: llog_lvfs_close, -// lop_cancel: llog_lvfs_cancel, -}; +struct llog_operations llog_lvfs_ops = {}; #endif