* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
file->f_pos = off;
- if (buflen == 0)
+ if (buflen == 0)
CWARN("0-length record\n");
if (!buf) {
RETURN(rc);
if (buf)
- /* write_blob adds header and tail to lrh_len. */
- reclen = sizeof(*rec) + rec->lrh_len +
+ /* write_blob adds header and tail to lrh_len. */
+ reclen = sizeof(*rec) + rec->lrh_len +
sizeof(struct llog_rec_tail);
if (idx != -1) {
if (idx && llh->llh_size && llh->llh_size != rec->lrh_len)
RETURN(-EINVAL);
- if (!ext2_test_bit(idx, llh->llh_bitmap))
+ 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);
RETURN(-EFAULT);
}
#if 1 /* FIXME remove this safety check at some point */
- /* Verify that the record we're modifying is the
+ /* 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,
+ idx, check.lrh_index, reclen,
check.lrh_len, rc);
RETURN(-EFAULT);
}
if (rc == 0 && reccookie) {
reccookie->lgc_lgl = loghandle->lgh_id;
reccookie->lgc_index = index;
- if ((rec->lrh_type == MDS_UNLINK_REC) ||
- (rec->lrh_type == MDS_SETATTR_REC))
+ if ((rec->lrh_type == MDS_UNLINK_REC) ||
+ (rec->lrh_type == MDS_SETATTR_REC) ||
+ (rec->lrh_type == MDS_SETATTR64_REC))
reccookie->lgc_subsys = LLOG_MDS_OST_ORIG_CTXT;
else if (rec->lrh_type == OST_SZ_REC)
reccookie->lgc_subsys = LLOG_SIZE_ORIG_CTXT;
struct obd_device *obd;
struct l_dentry *dchild = NULL;
struct obdo *oa = NULL;
- int rc = 0, cleanup_phase = 1;
+ int rc = 0;
int open_flags = O_RDWR | O_CREAT | O_LARGEFILE;
ENTRY;
if (logid != NULL) {
dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, logid->lgl_oid,
- logid->lgl_ogen, logid->lgl_ogr);
+ 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(cleanup, rc);
+ GOTO(out, rc);
}
- cleanup_phase = 2;
if (dchild->d_inode == NULL) {
+ l_dput(dchild);
rc = -ENOENT;
CERROR("nonexistent log file "LPX64":"LPX64": rc %d\n",
- logid->lgl_oid, logid->lgl_ogr, rc);
- GOTO(cleanup, rc);
+ 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(cleanup, rc);
+ GOTO(out, rc);
}
/* assign the value of lgh_id for handle directly */
handle->lgh_id = *logid;
} else if (name) {
- /* 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);
- }
+ 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));
+ GOTO(out, rc = PTR_ERR(handle->lgh_file));
- handle->lgh_id.lgl_ogr = 1;
+ 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 =
} else {
OBDO_ALLOC(oa);
if (oa == NULL)
- GOTO(cleanup, rc = -ENOMEM);
+ GOTO(out, rc = -ENOMEM);
- oa->o_gr = FILTER_GROUP_LLOG;
+ oa->o_seq = FID_SEQ_LLOG;
oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLGROUP;
rc = obd_create(ctxt->loc_exp, oa, NULL, NULL);
if (rc)
- GOTO(cleanup, 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_gr);
+ oa->o_generation, oa->o_seq);
if (IS_ERR(dchild))
- GOTO(cleanup, rc = PTR_ERR(dchild));
- cleanup_phase = 2;
+ 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(cleanup, rc = PTR_ERR(handle->lgh_file));
+ GOTO(out, rc = PTR_ERR(handle->lgh_file));
- handle->lgh_id.lgl_ogr = oa->o_gr;
+ 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;
- finish:
+out:
+ if (rc)
+ llog_free_handle(handle);
+
if (oa)
OBDO_FREE(oa);
RETURN(rc);
-cleanup:
- switch (cleanup_phase) {
- case 2:
- l_dput(dchild);
- case 1:
- llog_free_handle(handle);
- }
- goto finish;
}
static int llog_lvfs_close(struct llog_handle *handle)
struct obdo *oa;
struct obd_device *obd = handle->lgh_ctxt->loc_exp->exp_obd;
char *dir;
- int rc;
+ void *th;
+ struct inode *inode;
+ int rc, rc1;
ENTRY;
- /* 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;
+ dir = MOUNT_CONFIGS_DIR;
fdentry = handle->lgh_file->f_dentry;
+ inode = fdentry->d_parent->d_inode;
if (strcmp(fdentry->d_parent->d_name.name, dir) == 0) {
- struct inode *inode = fdentry->d_parent->d_inode;
struct lvfs_run_ctxt saved;
struct vfsmount *mnt = mntget(handle->lgh_file->f_vfsmnt);
rc = llog_lvfs_close(handle);
if (rc == 0) {
- LOCK_INODE_MUTEX(inode);
+ LOCK_INODE_MUTEX_PARENT(inode);
rc = ll_vfs_unlink(inode, fdentry, mnt);
UNLOCK_INODE_MUTEX(inode);
}
RETURN(-ENOMEM);
oa->o_id = handle->lgh_id.lgl_oid;
- oa->o_gr = handle->lgh_id.lgl_ogr;
+ oa->o_seq = handle->lgh_id.lgl_oseq;
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);
if (rc)
GOTO(out, rc);
- rc = obd_destroy(handle->lgh_ctxt->loc_exp, oa, NULL, NULL, NULL);
+ th = fsfilt_start_log(obd, inode, FSFILT_OP_UNLINK, NULL, 1);
+ if (IS_ERR(th)) {
+ CERROR("fsfilt_start failed: %ld\n", PTR_ERR(th));
+ GOTO(out, rc = PTR_ERR(th));
+ }
+
+ rc = obd_destroy(handle->lgh_ctxt->loc_exp, oa, NULL, NULL, NULL, NULL);
+
+ rc1 = fsfilt_commit(obd, inode, th, 0);
+ if (rc == 0 && rc1 != 0)
+ rc = rc1;
out:
OBDO_FREE(oa);
RETURN(rc);
}
/* reads the catalog list */
-int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+int llog_get_cat_list(struct obd_device *disk_obd,
char *name, int idx, int count, struct llog_catid *idarray)
{
struct lvfs_run_ctxt saved;
loff_t off = idx * sizeof(*idarray);
ENTRY;
- if (!count)
+ if (!count)
RETURN(0);
- push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ 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);
EXIT;
out:
- pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
if (file && !IS_ERR(file))
rc1 = filp_close(file, 0);
if (rc == 0)
EXPORT_SYMBOL(llog_get_cat_list);
/* writes the cat list */
-int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+int llog_put_cat_list(struct obd_device *disk_obd,
char *name, int idx, int count, struct llog_catid *idarray)
{
struct lvfs_run_ctxt saved;
if (!count)
GOTO(out1, rc = 0);
- push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ 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);
}
out:
- pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
if (file && !IS_ERR(file))
rc1 = filp_close(file, 0);
return 0;
}
-int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+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 *obd, struct obd_device *disk_obd,
+int llog_put_cat_list(struct obd_device *disk_obd,
char *name, int idx, int count, struct llog_catid *idarray)
{
LBUG();
git://git.whamcloud.com / fs / lustre-release.git / blobdiff