#include <linux/lustre_fsfilt.h>
#include <portals/list.h>
+#include <linux/lustre_smfs.h>
#include "mds_internal.h"
/* This limit is arbitrary, but for now we fit it in 1 page (32k clients) */
}
}
- CDEBUG(D_INFO, "client at index %d with UUID '%s' added\n",
+ CDEBUG(D_INFO, "client at idx %d with UUID '%s' added\n",
cl_idx, med->med_mcd->mcd_uuid);
med->med_idx = cl_idx;
- med->med_off = MDS_LR_CLIENT_START + (cl_idx * MDS_LR_CLIENT_SIZE);
+ med->med_off = le32_to_cpu(mds->mds_server_data->msd_client_start) +
+ (cl_idx * le16_to_cpu(mds->mds_server_data->msd_client_size));
if (new_client) {
- struct obd_run_ctxt saved;
+ struct lvfs_run_ctxt saved;
loff_t off = med->med_off;
struct file *file = mds->mds_rcvd_filp;
- void *handle;
- int rc, err;
-
- push_ctxt(&saved, &obd->obd_ctxt, NULL);
- /* We need to start a transaction here first, to avoid a
- * possible ordering deadlock on last_rcvd->i_sem and the
- * journal lock. In most places we start the journal handle
- * first (because we do compound transactions), and then
- * later do the write into last_rcvd, which gets i_sem.
- *
- * Without this transaction, clients connecting at the same
- * time other MDS operations are ongoing get last_rcvd->i_sem
- * first (in generic_file_write()) and start the journal
- * transaction afterwards, and can deadlock with other ops.
- *
- * We use FSFILT_OP_SETATTR because it is smallest, but all
- * ops include enough space for the last_rcvd update so we
- * could use any of them, or maybe an FSFILT_OP_NONE is best?
- */
- handle = fsfilt_start(obd, file->f_dentry->d_inode,
- FSFILT_OP_SETATTR, NULL);
- if (IS_ERR(handle)) {
- rc = PTR_ERR(handle);
- CERROR("unable to start transaction: rc %d\n", rc);
- } else {
- rc = fsfilt_write_record(obd, file, med->med_mcd,
- sizeof(*med->med_mcd),
- &off, 1);
- err = fsfilt_commit(obd, file->f_dentry->d_inode,
- handle, 1);
- if (rc == 0)
- rc = err;
- }
- pop_ctxt(&saved, &obd->obd_ctxt, NULL);
+ int rc;
+
+ push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ rc = fsfilt_write_record(obd, file, med->med_mcd,
+ sizeof(*med->med_mcd), &off, 1);
+ pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
if (rc)
return rc;
struct mds_obd *mds = &exp->exp_obd->u.mds;
struct obd_device *obd = exp->exp_obd;
struct mds_client_data zero_mcd;
- struct obd_run_ctxt saved;
+ struct lvfs_run_ctxt saved;
int rc;
unsigned long *bitmap = mds->mds_client_bitmap;
- LASSERT(bitmap);
if (!med->med_mcd)
RETURN(0);
if (!strcmp(med->med_mcd->mcd_uuid, obd->obd_uuid.uuid))
GOTO(free_and_out, 0);
- CDEBUG(D_INFO, "freeing client at index %u (%lld)with UUID '%s'\n",
+ CDEBUG(D_INFO, "freeing client at idx %u (%lld)with UUID '%s'\n",
med->med_idx, med->med_off, med->med_mcd->mcd_uuid);
- if (!test_and_clear_bit(med->med_idx, bitmap)) {
+ LASSERT(bitmap);
+
+ /* Clear the bit _after_ zeroing out the client so we don't
+ race with mds_client_add and zero out new clients.*/
+ if (!test_bit(med->med_idx, bitmap)) {
CERROR("MDS client %u: bit already clear in bitmap!!\n",
med->med_idx);
LBUG();
if (clear_client) {
memset(&zero_mcd, 0, sizeof zero_mcd);
- push_ctxt(&saved, &obd->obd_ctxt, NULL);
- rc = fsfilt_write_record(obd, mds->mds_rcvd_filp,
- &zero_mcd, sizeof(zero_mcd),
- &med->med_off, 1);
- pop_ctxt(&saved, &obd->obd_ctxt, NULL);
+ push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ rc = fsfilt_write_record(obd, mds->mds_rcvd_filp, &zero_mcd,
+ sizeof(zero_mcd), &med->med_off, 1);
+ pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
CDEBUG(rc == 0 ? D_INFO : D_ERROR,
- "zeroing out client %s off %u in %s rc %d\n",
+ "zeroing out client %s idx %u in %s rc %d\n",
med->med_mcd->mcd_uuid, med->med_idx, LAST_RCVD, rc);
}
+ if (!test_and_clear_bit(med->med_idx, bitmap)) {
+ CERROR("MDS client %u: bit already clear in bitmap!!\n",
+ med->med_idx);
+ LBUG();
+ }
+
+
+ /* Make sure the server's last_transno is up to date. Do this
+ * after the client is freed so we know all the client's
+ * transactions have been committed. */
+ mds_update_server_data(exp->exp_obd, 1);
+
free_and_out:
OBD_FREE(med->med_mcd, sizeof(*med->med_mcd));
struct mds_client_data *mcd = NULL;
loff_t off = 0;
unsigned long last_rcvd_size = file->f_dentry->d_inode->i_size;
- __u64 last_transno = 0;
__u64 mount_count;
int cl_idx, rc = 0;
ENTRY;
- LASSERT(sizeof(struct mds_client_data) == MDS_LR_CLIENT_SIZE);
- LASSERT(sizeof(struct mds_server_data) <= MDS_LR_SERVER_SIZE);
+ /* ensure padding in the struct is the correct size */
+ LASSERT(offsetof(struct mds_server_data, msd_padding) +
+ sizeof(msd->msd_padding) == MDS_LR_SERVER_SIZE);
+ LASSERT(offsetof(struct mds_client_data, mcd_padding) +
+ sizeof(mcd->mcd_padding) == MDS_LR_CLIENT_SIZE);
OBD_ALLOC_WAIT(msd, sizeof(*msd));
if (!msd)
if (last_rcvd_size == 0) {
CWARN("%s: initializing new %s\n", obd->obd_name, LAST_RCVD);
+
memcpy(msd->msd_uuid, obd->obd_uuid.uuid,sizeof(msd->msd_uuid));
+ msd->msd_last_transno = 0;
+ mount_count = msd->msd_mount_count = 0;
msd->msd_server_size = cpu_to_le32(MDS_LR_SERVER_SIZE);
msd->msd_client_start = cpu_to_le32(MDS_LR_CLIENT_START);
msd->msd_client_size = cpu_to_le16(MDS_LR_CLIENT_SIZE);
msd->msd_feature_rocompat = cpu_to_le32(MDS_ROCOMPAT_LOVOBJID);
- rc = fsfilt_write_record(obd, file, msd, sizeof(*msd), &off, 1);
-
- if (rc == 0)
- RETURN(0);
-
- CERROR("%s: error writing new MSD: %d\n", obd->obd_name, rc);
- GOTO(err_msd, rc);
- }
-
- rc = fsfilt_read_record(obd, file, msd, sizeof(*msd), &off);
- if (rc) {
- CERROR("error reading MDS %s: rc = %d\n", LAST_RCVD, rc);
- GOTO(err_msd, rc);
+ } else {
+ rc = fsfilt_read_record(obd, file, msd, sizeof(*msd), &off);
+ if (rc) {
+ CERROR("error reading MDS %s: rc = %d\n", LAST_RCVD, rc);
+ GOTO(err_msd, rc);
+ }
+ if (strcmp(msd->msd_uuid, obd->obd_uuid.uuid) != 0) {
+ CERROR("OBD UUID %s does not match last_rcvd UUID %s\n",
+ obd->obd_uuid.uuid, msd->msd_uuid);
+ GOTO(err_msd, rc = -EINVAL);
+ }
+ mount_count = le64_to_cpu(msd->msd_mount_count);
}
- if (!msd->msd_server_size)
- msd->msd_server_size = cpu_to_le32(MDS_LR_SERVER_SIZE);
- if (!msd->msd_client_start)
- msd->msd_client_start = cpu_to_le32(MDS_LR_CLIENT_START);
- if (!msd->msd_client_size)
- msd->msd_client_size = cpu_to_le16(MDS_LR_CLIENT_SIZE);
-
if (msd->msd_feature_incompat & ~cpu_to_le32(MDS_INCOMPAT_SUPP)) {
CERROR("unsupported incompat feature %x\n",
le32_to_cpu(msd->msd_feature_incompat) &
GOTO(err_msd, rc = -EINVAL);
}
- last_transno = le64_to_cpu(msd->msd_last_transno);
- mds->mds_last_transno = last_transno;
-
- mount_count = le64_to_cpu(msd->msd_mount_count);
- mds->mds_mount_count = mount_count;
+ mds->mds_last_transno = le64_to_cpu(msd->msd_last_transno);
CDEBUG(D_INODE, "%s: server last_transno: "LPU64"\n",
- obd->obd_name, last_transno);
+ obd->obd_name, mds->mds_last_transno);
CDEBUG(D_INODE, "%s: server mount_count: "LPU64"\n",
- obd->obd_name, mount_count);
+ obd->obd_name, mount_count + 1);
CDEBUG(D_INODE, "%s: server data size: %u\n",
obd->obd_name, le32_to_cpu(msd->msd_server_size));
CDEBUG(D_INODE, "%s: per-client data start: %u\n",
CDEBUG(D_INODE, "%s: last_rcvd size: %lu\n",
obd->obd_name, last_rcvd_size);
CDEBUG(D_INODE, "%s: last_rcvd clients: %lu\n", obd->obd_name,
- last_rcvd_size <= MDS_LR_CLIENT_START ? 0 :
- (last_rcvd_size - MDS_LR_CLIENT_START) / MDS_LR_CLIENT_SIZE);
+ last_rcvd_size <= le32_to_cpu(msd->msd_client_start) ? 0 :
+ (last_rcvd_size - le32_to_cpu(msd->msd_client_start)) /
+ le16_to_cpu(msd->msd_client_size));
/* When we do a clean MDS shutdown, we save the last_transno into
* the header. If we find clients with higher last_transno values
for (cl_idx = 0, off = le32_to_cpu(msd->msd_client_start);
off < last_rcvd_size; cl_idx++) {
__u64 last_transno;
- int mount_age;
+ struct obd_export *exp;
+ struct mds_export_data *med;
if (!mcd) {
OBD_ALLOC_WAIT(mcd, sizeof(*mcd));
/* These exports are cleaned up by mds_disconnect(), so they
* need to be set up like real exports as mds_connect() does.
*/
- mount_age = mount_count - le64_to_cpu(mcd->mcd_mount_count);
- if (mount_age < MDS_MOUNT_RECOV) {
- struct obd_export *exp = class_new_export(obd);
- struct mds_export_data *med;
- CDEBUG(D_HA, "RCVRNG CLIENT uuid: %s idx: %d lr: "LPU64
- " srv lr: "LPU64" mnt: "LPU64" last mount: "
- LPU64"\n", mcd->mcd_uuid, cl_idx,
- last_transno, le64_to_cpu(msd->msd_last_transno),
- le64_to_cpu(mcd->mcd_mount_count), mount_count);
- if (exp == NULL)
- GOTO(err_client, rc = -ENOMEM);
-
- memcpy(&exp->exp_client_uuid.uuid, mcd->mcd_uuid,
- sizeof exp->exp_client_uuid.uuid);
- med = &exp->exp_mds_data;
- med->med_mcd = mcd;
- mds_client_add(obd, mds, med, cl_idx);
- /* create helper if export init gets more complex */
- INIT_LIST_HEAD(&med->med_open_head);
- spin_lock_init(&med->med_open_lock);
-
- mcd = NULL;
- obd->obd_recoverable_clients++;
- obd->obd_max_recoverable_clients++;
- class_export_put(exp);
- } else {
- CDEBUG(D_INFO, "discarded client %d, UUID '%s', count "
- LPU64"\n", cl_idx, mcd->mcd_uuid,
- le64_to_cpu(mcd->mcd_mount_count));
- }
+ CDEBUG(D_HA|D_WARNING,"RCVRNG CLIENT uuid: %s idx: %d lr: "LPU64
+ " srv lr: "LPU64" lx: "LPU64"\n", mcd->mcd_uuid, cl_idx,
+ last_transno, le64_to_cpu(msd->msd_last_transno),
+ mcd->mcd_last_xid);
+
+ exp = class_new_export(obd);
+ if (exp == NULL)
+ GOTO(err_client, rc = -ENOMEM);
+
+ memcpy(&exp->exp_client_uuid.uuid, mcd->mcd_uuid,
+ sizeof exp->exp_client_uuid.uuid);
+ med = &exp->exp_mds_data;
+ med->med_mcd = mcd;
+ mds_client_add(obd, mds, med, cl_idx);
+ /* create helper if export init gets more complex */
+ INIT_LIST_HEAD(&med->med_open_head);
+ spin_lock_init(&med->med_open_lock);
+
+ mcd = NULL;
+ exp->exp_replay_needed = 1;
+ obd->obd_recoverable_clients++;
+ obd->obd_max_recoverable_clients++;
+ class_export_put(exp);
CDEBUG(D_OTHER, "client at idx %d has last_transno = "LPU64"\n",
cl_idx, last_transno);
if (last_transno > mds->mds_last_transno)
- mds->mds_last_transno = last_transno;
+ mds->mds_last_transno = last_transno;
}
obd->obd_last_committed = mds->mds_last_transno;
if (obd->obd_recoverable_clients) {
- CWARN("RECOVERY: %d recoverable clients, last_transno "
- LPU64"\n", obd->obd_recoverable_clients,
- mds->mds_last_transno);
+ CWARN("RECOVERY: service %s, %d recoverable clients, "
+ "last_transno "LPU64"\n", obd->obd_name,
+ obd->obd_recoverable_clients, mds->mds_last_transno);
obd->obd_next_recovery_transno = obd->obd_last_committed + 1;
- obd->obd_recovering = 1;
+ target_start_recovery_thread(obd, mds_handle);
}
if (mcd)
OBD_FREE(mcd, sizeof(*mcd));
+
+ mds->mds_mount_count = mount_count + 1;
+ msd->msd_mount_count = cpu_to_le64(mds->mds_mount_count);
- return 0;
+ /* save it, so mount count and last_transno is current */
+ rc = mds_update_server_data(obd, 1);
+
+ RETURN(rc);
err_client:
class_disconnect_exports(obd, 0);
err_msd:
mds_server_free_data(mds);
- return rc;
+ RETURN(rc);
+}
+
+static int mds_fs_post_setup(struct obd_device *obd)
+{
+ struct mds_obd *mds = &obd->u.mds;
+ struct dentry *de = mds_fid2dentry(mds, &mds->mds_rootfid, NULL);
+ int rc = 0;
+
+ rc = fsfilt_post_setup(obd, de);
+ if (rc)
+ GOTO(out, rc);
+
+ fsfilt_set_fs_flags(obd, de->d_inode,
+ SM_DO_REC | SM_DO_COW);
+ fsfilt_set_fs_flags(obd, mds->mds_pending_dir->d_inode,
+ SM_DO_REC | SM_DO_COW);
+ fsfilt_set_mds_flags(obd, mds->mds_sb);
+out:
+ l_dput(de);
+ return rc;
}
int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt)
{
struct mds_obd *mds = &obd->u.mds;
- struct obd_run_ctxt saved;
+ struct lvfs_run_ctxt saved;
struct dentry *dentry;
struct file *file;
int rc;
ENTRY;
-
- /* Get rid of unneeded supplementary groups */
- current->ngroups = 0;
- memset(current->groups, 0, sizeof(current->groups));
+ rc = cleanup_group_info();
+ if (rc)
+ RETURN(rc);
mds->mds_vfsmnt = mnt;
mds->mds_sb = mnt->mnt_root->d_inode->i_sb;
fsfilt_setup(obd, mds->mds_sb);
- OBD_SET_CTXT_MAGIC(&obd->obd_ctxt);
- obd->obd_ctxt.pwdmnt = mnt;
- obd->obd_ctxt.pwd = mnt->mnt_root;
- obd->obd_ctxt.fs = get_ds();
- obd->obd_ctxt.cb_ops = mds_lvfs_ops;
+ OBD_SET_CTXT_MAGIC(&obd->obd_lvfs_ctxt);
+ obd->obd_lvfs_ctxt.pwdmnt = mnt;
+ obd->obd_lvfs_ctxt.pwd = mnt->mnt_root;
+ obd->obd_lvfs_ctxt.fs = get_ds();
+ obd->obd_lvfs_ctxt.cb_ops = mds_lvfs_ops;
/* setup the directory tree */
- push_ctxt(&saved, &obd->obd_ctxt, NULL);
- dentry = simple_mkdir(current->fs->pwd, "ROOT", 0755);
+ push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ dentry = simple_mkdir(current->fs->pwd, "ROOT", 0755, 0);
if (IS_ERR(dentry)) {
rc = PTR_ERR(dentry);
CERROR("cannot create ROOT directory: rc = %d\n", rc);
dentry = lookup_one_len("__iopen__", current->fs->pwd,
strlen("__iopen__"));
- if (IS_ERR(dentry) || !dentry->d_inode) {
- rc = (IS_ERR(dentry)) ? PTR_ERR(dentry): -ENOENT;
- CERROR("cannot open iopen FH directory: rc = %d\n", rc);
+ if (IS_ERR(dentry)) {
+ rc = PTR_ERR(dentry);
+ CERROR("cannot lookup __iopen__ directory: rc = %d\n", rc);
GOTO(err_pop, rc);
}
+ if (!dentry->d_inode) {
+ rc = -ENOENT;
+ CERROR("__iopen__ directory has no inode? rc = %d\n", rc);
+ GOTO(err_fid, rc);
+ }
mds->mds_fid_de = dentry;
- dentry = simple_mkdir(current->fs->pwd, "PENDING", 0777);
+ dentry = simple_mkdir(current->fs->pwd, "PENDING", 0777, 1);
if (IS_ERR(dentry)) {
rc = PTR_ERR(dentry);
CERROR("cannot create PENDING directory: rc = %d\n", rc);
GOTO(err_fid, rc);
}
mds->mds_pending_dir = dentry;
-
- dentry = simple_mkdir(current->fs->pwd, "LOGS", 0777);
+
+ dentry = simple_mkdir(current->fs->pwd, "LOGS", 0777, 1);
if (IS_ERR(dentry)) {
rc = PTR_ERR(dentry);
CERROR("cannot create LOGS directory: rc = %d\n", rc);
}
mds->mds_logs_dir = dentry;
- dentry = simple_mkdir(current->fs->pwd, "OBJECTS", 0777);
+ dentry = simple_mkdir(current->fs->pwd, "OBJECTS", 0777, 1);
if (IS_ERR(dentry)) {
rc = PTR_ERR(dentry);
CERROR("cannot create OBJECTS directory: rc = %d\n", rc);
}
mds->mds_objects_dir = dentry;
+ dentry = simple_mkdir(current->fs->pwd, "FIDS", 0777, 1);
+ if (IS_ERR(dentry)) {
+ rc = PTR_ERR(dentry);
+ CERROR("cannot create FIDS directory: rc = %d\n", rc);
+ GOTO(err_fids, rc);
+ }
+ mds->mds_fids_dir = dentry;
+
+ dentry = simple_mkdir(current->fs->pwd, "UNNAMED", 0777, 1);
+ if (IS_ERR(dentry)) {
+ rc = PTR_ERR(dentry);
+ CERROR("cannot create UNNAMED directory: rc = %d\n", rc);
+ GOTO(err_unnamed, rc);
+ }
+ mds->mds_unnamed_dir = dentry;
+
/* open and test the last rcvd file */
file = filp_open(LAST_RCVD, O_RDWR | O_CREAT, 0644);
if (IS_ERR(file)) {
GOTO(err_lov_objid, rc = -ENOENT);
}
err_pop:
- pop_ctxt(&saved, &obd->obd_ctxt, NULL);
-
+ if (!rc) {
+ rc = mds_fs_post_setup(obd);
+ if (rc)
+ CERROR("can not post setup fsfilt\n");
+ }
+ pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
return rc;
err_lov_objid:
err_last_rcvd:
if (mds->mds_rcvd_filp && filp_close(mds->mds_rcvd_filp, 0))
CERROR("can't close %s after error\n", LAST_RCVD);
+err_unnamed:
+ dput(mds->mds_unnamed_dir);
+err_fids:
+ dput(mds->mds_fids_dir);
err_objects:
dput(mds->mds_objects_dir);
err_logs:
goto err_pop;
}
+static int mds_fs_post_cleanup(struct obd_device *obd)
+{
+ int rc = 0;
+ rc = fsfilt_post_cleanup(obd);
+ return rc;
+}
int mds_fs_cleanup(struct obd_device *obd, int flags)
{
struct mds_obd *mds = &obd->u.mds;
- struct obd_run_ctxt saved;
+ struct lvfs_run_ctxt saved;
int rc = 0;
if (flags & OBD_OPT_FAILOVER)
class_disconnect_exports(obd, flags); /* cleans up client info too */
mds_server_free_data(mds);
- push_ctxt(&saved, &obd->obd_ctxt, NULL);
+ push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
if (mds->mds_rcvd_filp) {
rc = filp_close(mds->mds_rcvd_filp, 0);
mds->mds_rcvd_filp = NULL;
if (rc)
CERROR("%s file won't close, rc=%d\n", LOV_OBJID, rc);
}
+ if (mds->mds_unnamed_dir != NULL) {
+ l_dput(mds->mds_unnamed_dir);
+ mds->mds_unnamed_dir = NULL;
+ }
+ if (mds->mds_fids_dir != NULL) {
+ l_dput(mds->mds_fids_dir);
+ mds->mds_fids_dir = NULL;
+ }
if (mds->mds_objects_dir != NULL) {
l_dput(mds->mds_objects_dir);
mds->mds_objects_dir = NULL;
l_dput(mds->mds_pending_dir);
mds->mds_pending_dir = NULL;
}
- pop_ctxt(&saved, &obd->obd_ctxt, NULL);
+ rc = mds_fs_post_cleanup(obd);
+
+ pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
shrink_dcache_parent(mds->mds_fid_de);
dput(mds->mds_fid_de);
* performance sensitive, it is accomplished by creating a file, checking the
* fid, and renaming it. */
int mds_obd_create(struct obd_export *exp, struct obdo *oa,
- struct lov_stripe_md **ea, struct obd_trans_info *oti)
+ struct lov_stripe_md **ea, struct obd_trans_info *oti)
{
struct mds_obd *mds = &exp->exp_obd->u.mds;
struct inode *parent_inode = mds->mds_objects_dir->d_inode;
- unsigned int tmpname = ll_insecure_random_int();
struct file *filp;
- struct dentry *new_child;
- struct obd_run_ctxt saved;
+ struct dentry *dchild;
+ struct lvfs_run_ctxt saved;
char fidname[LL_FID_NAMELEN];
void *handle;
int rc = 0, err, namelen;
ENTRY;
- push_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
-
- sprintf(fidname, "OBJECTS/%u", tmpname);
+ push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+ down(&parent_inode->i_sem);
+ if (oa->o_id) {
+ namelen = ll_fid2str(fidname, oa->o_id, oa->o_generation);
+
+ dchild = lookup_one_len(fidname, mds->mds_objects_dir, namelen);
+ if (IS_ERR(dchild))
+ GOTO(out_pop, rc = PTR_ERR(dchild));
+
+ if (dchild->d_inode == NULL) {
+ struct dentry_params dp;
+ struct inode *inode;
+
+ dchild->d_fsdata = (void *) &dp;
+ dp.p_ptr = NULL;
+ dp.p_inum = oa->o_id;
+ rc = ll_vfs_create(parent_inode, dchild, S_IFREG, NULL);
+ if (dchild->d_fsdata == (void *)(unsigned long)oa->o_id)
+ dchild->d_fsdata = NULL;
+ if (rc) {
+ CDEBUG(D_INODE, "err during create: %d\n", rc);
+ dput(dchild);
+ GOTO(out_pop, rc);
+ }
+ inode = dchild->d_inode;
+ LASSERT(inode->i_ino == oa->o_id);
+ inode->i_generation = oa->o_generation;
+ CDEBUG(D_HA, "recreated ino %lu with gen %u\n",
+ inode->i_ino, inode->i_generation);
+ mark_inode_dirty(inode);
+ } else {
+ CWARN("it should be here!\n");
+ }
+ GOTO(out_pop, rc);
+ }
+
+ sprintf(fidname, "OBJECTS/%u.%u",ll_insecure_random_int(),current->pid);
filp = filp_open(fidname, O_CREAT | O_EXCL, 0644);
if (IS_ERR(filp)) {
rc = PTR_ERR(filp);
if (rc == -EEXIST) {
- CERROR("impossible object name collision %u\n",
- tmpname);
+ CERROR("impossible object name collision %s\n",
+ fidname);
LBUG();
}
- CERROR("error creating tmp object %u: rc %d\n", tmpname, rc);
+ CERROR("error creating tmp object %s: rc %d\n", fidname, rc);
GOTO(out_pop, rc);
}
oa->o_generation = filp->f_dentry->d_inode->i_generation;
namelen = ll_fid2str(fidname, oa->o_id, oa->o_generation);
- down(&parent_inode->i_sem);
- new_child = lookup_one_len(fidname, mds->mds_objects_dir, namelen);
+ dchild = lookup_one_len(fidname, mds->mds_objects_dir, namelen);
- if (IS_ERR(new_child)) {
+ if (IS_ERR(dchild)) {
CERROR("getting neg dentry for obj rename: %d\n", rc);
- GOTO(out_close, rc = PTR_ERR(new_child));
+ GOTO(out_close, rc = PTR_ERR(dchild));
}
- if (new_child->d_inode != NULL) {
+ if (dchild->d_inode != NULL) {
CERROR("impossible non-negative obj dentry " LPU64":%u!\n",
oa->o_id, oa->o_generation);
LBUG();
handle = fsfilt_start(exp->exp_obd, mds->mds_objects_dir->d_inode,
FSFILT_OP_RENAME, NULL);
- if (IS_ERR(handle))
+ if (IS_ERR(handle))
GOTO(out_dput, rc = PTR_ERR(handle));
-
+
lock_kernel();
rc = vfs_rename(mds->mds_objects_dir->d_inode, filp->f_dentry,
- mds->mds_objects_dir->d_inode, new_child);
+ mds->mds_objects_dir->d_inode, dchild);
unlock_kernel();
if (rc)
CERROR("error renaming new object "LPU64":%u: rc %d\n",
oa->o_id, oa->o_generation, rc);
- err = fsfilt_commit(exp->exp_obd, mds->mds_objects_dir->d_inode,
- handle, 0);
- if (!err)
- oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGENER;
- else if (!rc)
+ err = fsfilt_commit(exp->exp_obd, mds->mds_sb,
+ mds->mds_objects_dir->d_inode, handle, 0);
+ if (!err) {
+ oa->o_gr = FILTER_GROUP_FIRST_MDS + mds->mds_num;
+ oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGENER | OBD_MD_FLGROUP;
+ } else if (!rc)
rc = err;
out_dput:
- dput(new_child);
+ dput(dchild);
out_close:
- up(&parent_inode->i_sem);
err = filp_close(filp, 0);
if (err) {
- CERROR("closing tmpfile %u: rc %d\n", tmpname, rc);
+ CERROR("closing tmpfile %s: rc %d\n", fidname, rc);
if (!rc)
rc = err;
}
out_pop:
- pop_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
+ up(&parent_inode->i_sem);
+ pop_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
RETURN(rc);
}
struct mds_obd *mds = &exp->exp_obd->u.mds;
struct inode *parent_inode = mds->mds_objects_dir->d_inode;
struct obd_device *obd = exp->exp_obd;
- struct obd_run_ctxt saved;
+ struct lvfs_run_ctxt saved;
char fidname[LL_FID_NAMELEN];
struct dentry *de;
void *handle;
int err, namelen, rc = 0;
ENTRY;
- push_ctxt(&saved, &obd->obd_ctxt, NULL);
+ push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
namelen = ll_fid2str(fidname, oa->o_id, oa->o_generation);
down(&parent_inode->i_sem);
de = lookup_one_len(fidname, mds->mds_objects_dir, namelen);
if (de == NULL || de->d_inode == NULL) {
- CERROR("destroying non-existent object "LPU64"\n", oa->o_id);
- GOTO(out, rc = IS_ERR(de) ? PTR_ERR(de) : -ENOENT);
+ CERROR("destroying non-existent object "LPU64" %s\n",
+ oa->o_id, fidname);
+ GOTO(out_dput, rc = IS_ERR(de) ? PTR_ERR(de) : -ENOENT);
}
- handle = fsfilt_start(obd, mds->mds_objects_dir->d_inode,
- FSFILT_OP_UNLINK_LOG, oti);
- if (IS_ERR(handle)) {
+ /* Stripe count is 1 here since this is some MDS specific stuff
+ that is unlinked, not spanned across multiple OSTs */
+ handle = fsfilt_start_log(obd, mds->mds_objects_dir->d_inode,
+ FSFILT_OP_UNLINK, oti, 1);
+
+ if (IS_ERR(handle))
GOTO(out_dput, rc = PTR_ERR(handle));
- }
rc = vfs_unlink(mds->mds_objects_dir->d_inode, de);
if (rc)
CERROR("error destroying object "LPU64":%u: rc %d\n",
oa->o_id, oa->o_generation, rc);
- err = fsfilt_commit(obd, mds->mds_objects_dir->d_inode, handle, 0);
+ err = fsfilt_commit(obd, mds->mds_sb, mds->mds_objects_dir->d_inode,
+ handle, 0);
if (err && !rc)
rc = err;
out_dput:
- l_dput(de);
-out:
+ if (de != NULL)
+ l_dput(de);
up(&parent_inode->i_sem);
- pop_ctxt(&saved, &obd->obd_ctxt, NULL);
+ pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
RETURN(rc);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff