X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_lvfs.c;h=43e2848f6416ba6286bf83b22c4131c8dbbcd1b8;hb=87319353501f4520284186e9e8bdb57695f90feb;hp=a5a94eb67f781ffdb21b0ef25c565b8e5d0b8503;hpb=1bd1be8bee38262465a3c0385a8f4608e17b04f6;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_lvfs.c b/lustre/obdclass/llog_lvfs.c index a5a94eb..43e2848 100644 --- a/lustre/obdclass/llog_lvfs.c +++ b/lustre/obdclass/llog_lvfs.c @@ -4,20 +4,23 @@ * Copyright (C) 2001-2003 Cluster File Systems, Inc. * Author: Andreas Dilger * - * This file is part of Lustre, http://www.lustre.org. + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions + * of that agreement, and the following does not apply to you. See the + * LICENSE file included with this distribution for more information. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * If you did not agree to a different license, then this copy of Lustre + * is open source software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * In either case, Lustre is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license text for more details. * * OST<->MDS recovery logging infrastructure. * @@ -32,36 +35,35 @@ #define EXPORT_SYMTAB #endif -#ifdef __KERNEL__ -#include -#else +#ifndef __KERNEL__ #include #endif -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "llog_internal.h" -#ifdef __KERNEL__ +#if defined(__KERNEL__) && defined(LLOG_LVFS) static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file, int len, int index) { - struct llog_rec_hdr rec; + struct llog_rec_hdr rec = { 0 }; struct llog_rec_tail tail; int rc; ENTRY; LASSERT(len >= LLOG_MIN_REC_SIZE && (len & 0x7) == 0); - tail.lrt_len = rec.lrh_len = cpu_to_le32(len); - tail.lrt_index = rec.lrh_index = cpu_to_le32(index); - rec.lrh_type = 0; + tail.lrt_len = rec.lrh_len = len; + tail.lrt_index = rec.lrh_index = index; + rec.lrh_type = LLOG_PAD_MAGIC; rc = fsfilt_write_record(obd, file, &rec, sizeof(rec), &file->f_pos, 0); if (rc) { @@ -70,7 +72,7 @@ static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file, } file->f_pos += len - sizeof(rec) - sizeof(tail); - rc = fsfilt_write_record(obd, file, &tail, sizeof(tail), &file->f_pos, 0); + rc = fsfilt_write_record(obd, file, &tail, sizeof(tail),&file->f_pos,0); if (rc) { CERROR("error writing padding record: rc %d\n", rc); goto out; @@ -86,13 +88,17 @@ static int llog_lvfs_write_blob(struct obd_device *obd, struct l_file *file, int rc; struct llog_rec_tail end; loff_t saved_off = file->f_pos; - int buflen = le32_to_cpu(rec->lrh_len); + int buflen = rec->lrh_len; ENTRY; + file->f_pos = off; + if (buflen == 0) + CWARN("0-length record\n"); + if (!buf) { - rc = fsfilt_write_record(obd, file, rec, buflen, &file->f_pos, 0); + rc = fsfilt_write_record(obd, file, rec, buflen,&file->f_pos,0); if (rc) { CERROR("error writing log record: rc %d\n", rc); goto out; @@ -101,7 +107,7 @@ static int llog_lvfs_write_blob(struct obd_device *obd, struct l_file *file, } /* the buf case */ - rec->lrh_len = cpu_to_le32(sizeof(*rec) + buflen + sizeof(end)); + rec->lrh_len = sizeof(*rec) + buflen + sizeof(end); rc = fsfilt_write_record(obd, file, rec, sizeof(*rec), &file->f_pos, 0); if (rc) { CERROR("error writing log hdr: rc %d\n", rc); @@ -147,33 +153,50 @@ static int llog_lvfs_read_blob(struct obd_device *obd, struct l_file *file, static int llog_lvfs_read_header(struct llog_handle *handle) { - struct llog_rec_tail tail; struct obd_device *obd; int rc; ENTRY; LASSERT(sizeof(*handle->lgh_hdr) == LLOG_CHUNK_SIZE); - + obd = handle->lgh_ctxt->loc_exp->exp_obd; - if (handle->lgh_file->f_dentry->d_inode->i_size == 0) { + if (i_size_read(handle->lgh_file->f_dentry->d_inode) == 0) { CDEBUG(D_HA, "not reading header from 0-byte log\n"); RETURN(LLOG_EEMPTY); } rc = llog_lvfs_read_blob(obd, handle->lgh_file, handle->lgh_hdr, LLOG_CHUNK_SIZE, 0); - if (rc) - CERROR("error reading log header\n"); - - rc = llog_lvfs_read_blob(obd, handle->lgh_file, &tail, sizeof(tail), - handle->lgh_file->f_dentry->d_inode->i_size - - sizeof(tail)); - if (rc) - CERROR("error reading log tail\n"); + if (rc) { + CERROR("error reading log header from %.*s\n", + handle->lgh_file->f_dentry->d_name.len, + handle->lgh_file->f_dentry->d_name.name); + } else { + struct llog_rec_hdr *llh_hdr = &handle->lgh_hdr->llh_hdr; + + if (LLOG_REC_HDR_NEEDS_SWABBING(llh_hdr)) + lustre_swab_llog_hdr(handle->lgh_hdr); + + if (llh_hdr->lrh_type != LLOG_HDR_MAGIC) { + CERROR("bad log %.*s header magic: %#x (expected %#x)\n", + handle->lgh_file->f_dentry->d_name.len, + handle->lgh_file->f_dentry->d_name.name, + llh_hdr->lrh_type, LLOG_HDR_MAGIC); + rc = -EIO; + } else if (llh_hdr->lrh_len != LLOG_CHUNK_SIZE) { + CERROR("incorrectly sized log %.*s header: %#x " + "(expected %#x)\n", + handle->lgh_file->f_dentry->d_name.len, + handle->lgh_file->f_dentry->d_name.name, + llh_hdr->lrh_len, LLOG_CHUNK_SIZE); + CERROR("you may need to re-run lconf --write_conf.\n"); + rc = -EIO; + } + } - handle->lgh_last_idx = le32_to_cpu(tail.lrt_index); - handle->lgh_file->f_pos = handle->lgh_file->f_dentry->d_inode->i_size; + handle->lgh_last_idx = handle->lgh_hdr->llh_tail.lrt_index; + handle->lgh_file->f_pos = i_size_read(handle->lgh_file->f_dentry->d_inode); RETURN(rc); } @@ -186,11 +209,10 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle, void *buf, int idx) { struct llog_log_hdr *llh; - int reclen = le32_to_cpu(rec->lrh_len), index, rc; + int reclen = rec->lrh_len, index, rc; struct llog_rec_tail *lrt; struct obd_device *obd; struct file *file; - loff_t offset; size_t left; ENTRY; @@ -200,37 +222,79 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle, /* record length should not bigger than LLOG_CHUNK_SIZE */ if (buf) - rc = (reclen > LLOG_CHUNK_SIZE - sizeof(struct llog_rec_hdr) - - sizeof(struct llog_rec_tail)) ? -E2BIG : 0; + rc = (reclen > LLOG_CHUNK_SIZE - sizeof(struct llog_rec_hdr) - + sizeof(struct llog_rec_tail)) ? -E2BIG : 0; else rc = (reclen > LLOG_CHUNK_SIZE) ? -E2BIG : 0; if (rc) RETURN(rc); - if (idx != -1) { + if (buf) + /* write_blob adds header and tail to lrh_len. */ + reclen = sizeof(*rec) + rec->lrh_len + + sizeof(struct llog_rec_tail); + + if (idx != -1) { loff_t saved_offset; /* no header: only allowed to insert record 1 */ - if (idx != 1 && !file->f_dentry->d_inode->i_size) { + if (idx != 1 && !i_size_read(file->f_dentry->d_inode)) { CERROR("idx != -1 in empty log\n"); LBUG(); } - if (idx && llh->llh_size && llh->llh_size != reclen) + if (idx && llh->llh_size && llh->llh_size != rec->lrh_len) RETURN(-EINVAL); + if (!ext2_test_bit(idx, llh->llh_bitmap)) + CERROR("Modify unset record %u\n", idx); + if (idx != rec->lrh_index) + CERROR("Index mismatch %d %u\n", idx, rec->lrh_index); + rc = llog_lvfs_write_blob(obd, file, &llh->llh_hdr, NULL, 0); /* we are done if we only write the header or on error */ if (rc || idx == 0) RETURN(rc); - saved_offset = sizeof(*llh) + (idx-1) * le32_to_cpu(rec->lrh_len); + /* 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 " + "offset %llu\n", + loghandle->lgh_id.lgl_oid, 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) { + CERROR("modify idx mismatch %u/%d\n", + 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 + } + rc = llog_lvfs_write_blob(obd, file, rec, buf, saved_offset); if (rc == 0 && reccookie) { reccookie->lgc_lgl = loghandle->lgh_id; reccookie->lgc_index = idx; rc = 1; - } + } RETURN(rc); } @@ -242,24 +306,26 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle, * big enough to hold reclen, so all we care about is padding here. */ left = LLOG_CHUNK_SIZE - (file->f_pos & (LLOG_CHUNK_SIZE - 1)); - if (buf) - reclen = sizeof(*rec) + le32_to_cpu(rec->lrh_len) + - sizeof(struct llog_rec_tail); /* NOTE: padding is a record, but no bit is set */ - if (left != 0 && left != reclen && + if (left != 0 && left != reclen && left < (reclen + LLOG_MIN_REC_SIZE)) { loghandle->lgh_last_idx++; rc = llog_lvfs_pad(obd, file, left, loghandle->lgh_last_idx); if (rc) RETURN(rc); + /* if it's the last idx in log file, then return -ENOSPC */ + if (loghandle->lgh_last_idx == LLOG_BITMAP_SIZE(llh) - 1) + RETURN(-ENOSPC); } loghandle->lgh_last_idx++; index = loghandle->lgh_last_idx; - rec->lrh_index = cpu_to_le32(index); + LASSERT(index < LLOG_BITMAP_SIZE(llh)); + rec->lrh_index = index; if (buf == NULL) { - lrt = (void *)rec + le32_to_cpu(rec->lrh_len) - sizeof(*lrt); + lrt = (struct llog_rec_tail *) + ((char *)rec + rec->lrh_len - sizeof(*lrt)); lrt->lrt_len = rec->lrh_len; lrt->lrt_index = rec->lrh_index; } @@ -267,9 +333,9 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle, CERROR("argh, index %u already set in log bitmap?\n", index); LBUG(); /* should never happen */ } - llh->llh_count = cpu_to_le32(le32_to_cpu(llh->llh_count) + 1); + llh->llh_count++; + llh->llh_tail.lrt_index = index; - offset = 0; rc = llog_lvfs_write_blob(obd, file, &llh->llh_hdr, NULL, 0); if (rc) RETURN(rc); @@ -278,21 +344,25 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle, if (rc) RETURN(rc); - CDEBUG(D_HA, "added record "LPX64": idx: %u, %u bytes\n", - loghandle->lgh_id.lgl_oid, index, le32_to_cpu(rec->lrh_len)); + CDEBUG(D_RPCTRACE, "added record "LPX64": idx: %u, %u bytes\n", + loghandle->lgh_id.lgl_oid, index, rec->lrh_len); if (rc == 0 && reccookie) { reccookie->lgc_lgl = loghandle->lgh_id; reccookie->lgc_index = index; - if (le32_to_cpu(rec->lrh_type) == MDS_UNLINK_REC) - reccookie->lgc_subsys = LLOG_UNLINK_ORIG_CTXT; - else if (le32_to_cpu(rec->lrh_type) == OST_SZ_REC) + if ((rec->lrh_type == MDS_UNLINK_REC) || + (rec->lrh_type == MDS_SETATTR_REC)) + reccookie->lgc_subsys = LLOG_MDS_OST_ORIG_CTXT; + else if (rec->lrh_type == OST_SZ_REC) reccookie->lgc_subsys = LLOG_SIZE_ORIG_CTXT; - else if (le32_to_cpu(rec->lrh_type) == OST_RAID1_REC) + else if (rec->lrh_type == OST_RAID1_REC) reccookie->lgc_subsys = LLOG_RD1_ORIG_CTXT; - else + else reccookie->lgc_subsys = -1; rc = 1; } + if (rc == 0 && rec->lrh_type == LLOG_GEN_REC) + rc = 1; + RETURN(rc); } @@ -306,7 +376,7 @@ static void llog_skip_over(__u64 *off, int curr, int goal) { if (goal <= curr) return; - *off = (*off + (goal-curr-1) * LLOG_MIN_REC_SIZE) & + *off = (*off + (goal-curr-1) * LLOG_MIN_REC_SIZE) & ~(LLOG_CHUNK_SIZE - 1); } @@ -329,7 +399,7 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, CDEBUG(D_OTHER, "looking for log index %u (cur idx %u off "LPU64")\n", next_idx, *cur_idx, *cur_offset); - while (*cur_offset < loghandle->lgh_file->f_dentry->d_inode->i_size) { + 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; @@ -339,19 +409,24 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, ppos = *cur_offset; rc = fsfilt_read_record(loghandle->lgh_ctxt->loc_exp->exp_obd, loghandle->lgh_file, buf, len, - cur_offset); - + &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, + loghandle->lgh_id.lgl_ogen, *cur_offset); - RETURN(rc); + RETURN(rc); } - /* put number of readed bytes in rc to make code simpler */ - rc = *cur_offset - ppos; + /* put number of bytes read into rc to make code simpler */ + rc = ppos - *cur_offset; + *cur_offset = ppos; + + if (rc < len) { + /* signal the end of the valid buffer to llog_process */ + memset(buf + rc, 0, len - rc); + } if (rc == 0) /* end of file, nothing to do */ RETURN(0); @@ -360,11 +435,18 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, 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); + RETURN(-EINVAL); } - tail = buf + rc - sizeof(struct llog_rec_tail); - *cur_idx = le32_to_cpu(tail->lrt_index); + 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); + } + + *cur_idx = tail->lrt_index; /* this shouldn't happen */ if (tail->lrt_index == 0) { @@ -373,15 +455,87 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, loghandle->lgh_id.lgl_ogen, *cur_offset); RETURN(-EINVAL); } - if (le32_to_cpu(tail->lrt_index) < next_idx) + if (tail->lrt_index < next_idx) + continue; + + /* sanity check that the start of the new buffer is no farther + * than the record that we wanted. This shouldn't happen. */ + if (rec->lrh_index > next_idx) { + CERROR("missed desired record? %u > %u\n", + rec->lrh_index, next_idx); + RETURN(-ENOENT); + } + RETURN(0); + } + RETURN(-EIO); +} + +static int llog_lvfs_prev_block(struct llog_handle *loghandle, + int prev_idx, void *buf, int len) +{ + __u64 cur_offset; + int rc; + ENTRY; + + if (len == 0 || len & (LLOG_CHUNK_SIZE - 1)) + RETURN(-EINVAL); + + CDEBUG(D_OTHER, "looking for log index %u\n", prev_idx); + + cur_offset = LLOG_CHUNK_SIZE; + 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); + } + + /* put number of bytes read into rc to make code simpler */ + rc = ppos - cur_offset; + 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, + loghandle->lgh_id.lgl_ogen, cur_offset); + RETURN(-EINVAL); + } + + tail = buf + rc - sizeof(struct llog_rec_tail); + + /* 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) 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) > next_idx) { + if (le32_to_cpu(rec->lrh_index) > prev_idx) { CERROR("missed desired record? %u > %u\n", - le32_to_cpu(rec->lrh_index), next_idx); + le32_to_cpu(rec->lrh_index), prev_idx); RETURN(-ENOENT); } RETURN(0); @@ -389,7 +543,7 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, RETURN(-EIO); } -static struct file *llog_filp_open(char *name, int flags, int mode) +static struct file *llog_filp_open(char *dir, char *name, int flags, int mode) { char *logname; struct file *filp; @@ -399,17 +553,16 @@ static struct file *llog_filp_open(char *name, int flags, int mode) if (logname == NULL) return ERR_PTR(-ENOMEM); - len = snprintf(logname, PATH_MAX, "LOGS/%s", name); + len = snprintf(logname, PATH_MAX, "%s/%s", dir, name); if (len >= PATH_MAX - 1) { filp = ERR_PTR(-ENAMETOOLONG); } else { filp = l_filp_open(logname, flags, mode); if (IS_ERR(filp)) - CERROR("logfile creation %s: %ld\n", logname, + CERROR("logfile creation %s: %ld\n", logname, PTR_ERR(filp)); } - - OBD_FREE(logname, PATH_MAX); + OBD_FREE(logname, PATH_MAX); return filp; } @@ -441,7 +594,7 @@ static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res, if (IS_ERR(dchild)) { rc = PTR_ERR(dchild); - CERROR("error looking up log file "LPX64":0x%x: rc %d\n", + CERROR("error looking up logfile "LPX64":0x%x: rc %d\n", logid->lgl_oid, logid->lgl_ogen, rc); GOTO(cleanup, rc); } @@ -454,7 +607,7 @@ static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res, GOTO(cleanup, rc); } - handle->lgh_file = l_dentry_open(&obd->obd_ctxt, dchild, + 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); @@ -467,7 +620,16 @@ static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res, handle->lgh_id = *logid; } else if (name) { - handle->lgh_file = llog_filp_open(name, open_flags, 0644); + /* COMPAT_146 */ + if (strcmp(obd->obd_type->typ_name, LUSTRE_MDS_NAME) == 0) { + handle->lgh_file = llog_filp_open(MDT_LOGS_DIR, name, + open_flags, 0644); + } else { + /* end COMPAT_146 */ + handle->lgh_file = llog_filp_open(MOUNT_CONFIGS_DIR, + name, open_flags, + 0644); + } if (IS_ERR(handle->lgh_file)) GOTO(cleanup, rc = PTR_ERR(handle->lgh_file)); @@ -477,12 +639,13 @@ static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res, handle->lgh_id.lgl_ogen = handle->lgh_file->f_dentry->d_inode->i_generation; } else { - oa = obdo_alloc(); + OBDO_ALLOC(oa); if (oa == NULL) GOTO(cleanup, rc = -ENOMEM); - /* XXX get some filter group constants */ - oa->o_gr = 1; + + oa->o_gr = FILTER_GROUP_LLOG; oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLGROUP; + rc = obd_create(ctxt->loc_exp, oa, NULL, NULL); if (rc) GOTO(cleanup, rc); @@ -493,7 +656,7 @@ static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res, if (IS_ERR(dchild)) GOTO(cleanup, rc = PTR_ERR(dchild)); cleanup_phase = 2; - handle->lgh_file = l_dentry_open(&obd->obd_ctxt, dchild, + handle->lgh_file = l_dentry_open(&obd->obd_lvfs_ctxt, dchild, open_flags); if (IS_ERR(handle->lgh_file)) GOTO(cleanup, rc = PTR_ERR(handle->lgh_file)); @@ -506,7 +669,7 @@ static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res, handle->lgh_ctxt = ctxt; finish: if (oa) - obdo_free(oa); + OBDO_FREE(oa); RETURN(rc); cleanup: switch (cleanup_phase) { @@ -531,11 +694,41 @@ static int llog_lvfs_close(struct llog_handle *handle) static int llog_lvfs_destroy(struct llog_handle *handle) { + struct dentry *fdentry; struct obdo *oa; + struct obd_device *obd = handle->lgh_ctxt->loc_exp->exp_obd; + char *dir; int rc; ENTRY; - oa = obdo_alloc(); + /* COMPAT_146 */ + if (strcmp(obd->obd_type->typ_name, LUSTRE_MDS_NAME) == 0) + dir = MDT_LOGS_DIR; + else + /* end COMPAT_146 */ + dir = MOUNT_CONFIGS_DIR; + + fdentry = handle->lgh_file->f_dentry; + if (strcmp(fdentry->d_parent->d_name.name, dir) == 0) { + struct inode *inode = fdentry->d_parent->d_inode; + struct lvfs_run_ctxt saved; + + push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); + dget(fdentry); + rc = llog_lvfs_close(handle); + + if (rc == 0) { + LOCK_INODE_MUTEX(inode); + rc = vfs_unlink(inode, fdentry); + UNLOCK_INODE_MUTEX(inode); + } + + dput(fdentry); + pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); + RETURN(rc); + } + + OBDO_ALLOC(oa); if (oa == NULL) RETURN(-ENOMEM); @@ -548,25 +741,27 @@ static int llog_lvfs_destroy(struct llog_handle *handle) if (rc) GOTO(out, rc); - rc = obd_destroy(handle->lgh_ctxt->loc_exp, oa, NULL, NULL); + rc = obd_destroy(handle->lgh_ctxt->loc_exp, oa, NULL, NULL, NULL); out: - obdo_free(oa); + OBDO_FREE(oa); RETURN(rc); } /* reads the catalog list */ int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd, - char *name, int count, struct llog_logid *idarray) + char *name, int count, struct llog_catid *idarray) { - struct obd_run_ctxt saved; + struct lvfs_run_ctxt saved; struct l_file *file; int rc; int size = sizeof(*idarray) * count; loff_t off = 0; + ENTRY; - LASSERT(count); + if (!count) + RETURN(0); - push_ctxt(&saved, &obd->obd_ctxt, NULL); + push_ctxt(&saved, &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); @@ -574,40 +769,45 @@ int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd, 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); + rc = fsfilt_read_record(disk_obd, file, idarray, size, &off); if (rc) { - CDEBUG(D_INODE,"OBD filter: error reading %s: rc %d\n", - name, rc); + CERROR("OBD filter: error reading %s: rc %d\n", name, rc); GOTO(out, rc); } + EXIT; out: - pop_ctxt(&saved, &obd->obd_ctxt, NULL); + pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); if (file && !IS_ERR(file)) rc = filp_close(file, 0); - RETURN(rc); + return rc; } +EXPORT_SYMBOL(llog_get_cat_list); /* writes the cat list */ int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd, - char *name, int count, struct llog_logid *idarray) + char *name, int count, struct llog_catid *idarray) { - struct obd_run_ctxt saved; + struct lvfs_run_ctxt saved; struct l_file *file; int rc; int size = sizeof(*idarray) * count; loff_t off = 0; - LASSERT(count); + if (!count) + return (0); - push_ctxt(&saved, &obd->obd_ctxt, NULL); + push_ctxt(&saved, &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); @@ -630,7 +830,7 @@ int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd, } out: - pop_ctxt(&saved, &obd->obd_ctxt, NULL); + pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); if (file && !IS_ERR(file)) rc = filp_close(file, 0); RETURN(rc); @@ -639,6 +839,7 @@ int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd, 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, @@ -655,14 +856,16 @@ 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, + 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) @@ -670,32 +873,42 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx, LBUG(); return 0; } -static int llog_lvfs_create(struct llog_obd_ctxt *ctxt, struct llog_handle **res, + +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 *obd, struct obd_device *disk_obd, - char *name, int count, struct llog_logid *idarray) +int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd, + char *name, int count, struct llog_catid *idarray) { LBUG(); return 0; } -int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd, - char *name, int count, struct llog_logid *idarray) +int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd, + char *name, int count, struct llog_catid *idarray) { LBUG(); return 0; @@ -704,6 +917,7 @@ int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd, 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,