@@ -737,7 +737,7 @@ struct md_op_data {
struct lu_fid op_fid4; /* to the operation locks. */
u32 op_mds; /* what mds server open will go to */
u32 op_mode;
- struct lustre_handle op_handle;
+ struct lustre_handle op_open_handle;
s64 op_mod_time;
const char *op_name;
size_t op_namelen;
@@ -933,7 +933,7 @@ struct md_open_data {
};
struct obd_client_handle {
- struct lustre_handle och_fh;
+ struct lustre_handle och_open_handle;
struct lu_fid och_fid;
struct md_open_data *och_mod;
struct lustre_handle och_lease_handle; /* open lock for lease */
@@ -103,7 +103,7 @@ static void ll_prepare_close(struct inode *inode, struct md_op_data *op_data,
op_data->op_attr_flags = ll_inode_to_ext_flags(inode->i_flags);
if (test_bit(LLIF_PROJECT_INHERIT, &lli->lli_flags))
op_data->op_attr_flags |= LUSTRE_PROJINHERIT_FL;
- op_data->op_handle = och->och_fh;
+ op_data->op_open_handle = och->och_open_handle;
/*
* For HSM: if inode data has been modified, pack it so that
@@ -230,7 +230,7 @@ static int ll_close_inode_openhandle(struct inode *inode,
out:
md_clear_open_replay_data(md_exp, och);
- och->och_fh.cookie = DEAD_HANDLE_MAGIC;
+ och->och_open_handle.cookie = DEAD_HANDLE_MAGIC;
kfree(och);
ptlrpc_req_finished(req);
@@ -613,7 +613,7 @@ static int ll_och_fill(struct obd_export *md_exp, struct lookup_intent *it,
struct mdt_body *body;
body = req_capsule_server_get(&it->it_request->rq_pill, &RMF_MDT_BODY);
- och->och_fh = body->mbo_handle;
+ och->och_open_handle = body->mbo_open_handle;
och->och_fid = body->mbo_fid1;
och->och_lease_handle.cookie = it->it_lock_handle;
och->och_magic = OBD_CLIENT_HANDLE_MAGIC;
@@ -903,7 +903,7 @@ static int ll_md_blocking_lease_ast(struct ldlm_lock *lock,
* if it has an open lock in cache already.
*/
static int ll_lease_och_acquire(struct inode *inode, struct file *file,
- struct lustre_handle *old_handle)
+ struct lustre_handle *old_open_handle)
{
struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
struct ll_inode_info *lli = ll_i2info(inode);
@@ -939,7 +939,7 @@ static int ll_lease_och_acquire(struct inode *inode, struct file *file,
*och_p = NULL;
}
- *old_handle = fd->fd_och->och_fh;
+ *old_open_handle = fd->fd_och->och_open_handle;
out_unlock:
mutex_unlock(&lli->lli_och_mutex);
@@ -999,7 +999,7 @@ static int ll_lease_och_release(struct inode *inode, struct file *file)
struct ll_sb_info *sbi = ll_i2sbi(inode);
struct md_op_data *op_data;
struct ptlrpc_request *req = NULL;
- struct lustre_handle old_handle = { 0 };
+ struct lustre_handle old_open_handle = { 0 };
struct obd_client_handle *och = NULL;
int rc;
int rc2;
@@ -1011,7 +1011,7 @@ static int ll_lease_och_release(struct inode *inode, struct file *file)
if (!(fmode & file->f_mode) || (file->f_mode & FMODE_EXEC))
return ERR_PTR(-EPERM);
- rc = ll_lease_och_acquire(inode, file, &old_handle);
+ rc = ll_lease_och_acquire(inode, file, &old_open_handle);
if (rc)
return ERR_PTR(rc);
}
@@ -1028,7 +1028,7 @@ static int ll_lease_och_release(struct inode *inode, struct file *file)
}
/* To tell the MDT this openhandle is from the same owner */
- op_data->op_handle = old_handle;
+ op_data->op_open_handle = old_open_handle;
it.it_flags = fmode | open_flags;
it.it_flags |= MDS_OPEN_LOCK | MDS_OPEN_BY_FID | MDS_OPEN_LEASE;
@@ -1230,7 +1230,7 @@ static int ll_lease_file_resync(struct obd_client_handle *och,
if (rc)
goto out;
- op_data->op_handle = och->och_lease_handle;
+ op_data->op_lease_handle = och->och_lease_handle;
rc = md_file_resync(sbi->ll_md_exp, op_data);
if (rc)
goto out;
@@ -3892,7 +3892,7 @@ int ll_migrate(struct inode *parent, struct file *file, struct lmv_user_md *lum,
if (rc)
goto out_close;
- op_data->op_handle = och->och_fh;
+ op_data->op_open_handle = och->och_open_handle;
op_data->op_data_version = data_version;
op_data->op_lease_handle = och->och_lease_handle;
op_data->op_bias |= MDS_CLOSE_MIGRATE;
@@ -3919,7 +3919,7 @@ int ll_migrate(struct inode *parent, struct file *file, struct lmv_user_md *lum,
obd_mod_put(och->och_mod);
md_clear_open_replay_data(ll_i2sbi(parent)->ll_md_exp,
och);
- och->och_fh.cookie = DEAD_HANDLE_MAGIC;
+ och->och_open_handle.cookie = DEAD_HANDLE_MAGIC;
kfree(och);
och = NULL;
}
@@ -2258,7 +2258,7 @@ void ll_open_cleanup(struct super_block *sb, struct ptlrpc_request *open_req)
return;
op_data->op_fid1 = body->mbo_fid1;
- op_data->op_handle = body->mbo_handle;
+ op_data->op_open_handle = body->mbo_open_handle;
op_data->op_mod_time = get_seconds();
md_close(exp, op_data, NULL, &close_req);
ptlrpc_req_finished(close_req);
@@ -254,7 +254,7 @@ void mdc_open_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
rec->cr_suppgid2 = op_data->op_suppgids[1];
rec->cr_bias = op_data->op_bias;
rec->cr_umask = current_umask();
- rec->cr_old_handle = op_data->op_handle;
+ rec->cr_open_handle_old = op_data->op_open_handle;
if (op_data->op_name) {
mdc_pack_name(req, &RMF_NAME, op_data->op_name,
@@ -359,7 +359,7 @@ static void mdc_setattr_pack_rec(struct mdt_rec_setattr *rec,
static void mdc_ioepoch_pack(struct mdt_ioepoch *epoch,
struct md_op_data *op_data)
{
- epoch->mio_handle = op_data->op_handle;
+ epoch->mio_open_handle = op_data->op_open_handle;
epoch->mio_unused1 = 0;
epoch->mio_unused2 = 0;
epoch->mio_padding = 0;
@@ -456,9 +456,9 @@ int mdc_file_resync(struct obd_export *exp, struct md_op_data *op_data)
rec->rs_fid = op_data->op_fid1;
rec->rs_bias = op_data->op_bias;
- lock = ldlm_handle2lock(&op_data->op_handle);
+ lock = ldlm_handle2lock(&op_data->op_lease_handle);
if (lock) {
- rec->rs_handle = lock->l_remote_handle;
+ rec->rs_lease_handle = lock->l_remote_handle;
LDLM_LOCK_PUT(lock);
}
@@ -593,7 +593,7 @@ void mdc_replay_open(struct ptlrpc_request *req)
struct md_open_data *mod = req->rq_cb_data;
struct ptlrpc_request *close_req;
struct obd_client_handle *och;
- struct lustre_handle old;
+ struct lustre_handle old_open_handle = { };
struct mdt_body *body;
if (!mod) {
@@ -606,22 +606,22 @@ void mdc_replay_open(struct ptlrpc_request *req)
spin_lock(&req->rq_lock);
och = mod->mod_och;
- if (och && och->och_fh.cookie)
+ if (och && och->och_open_handle.cookie)
req->rq_early_free_repbuf = 1;
else
req->rq_early_free_repbuf = 0;
spin_unlock(&req->rq_lock);
if (req->rq_early_free_repbuf) {
- struct lustre_handle *file_fh;
+ struct lustre_handle *file_open_handle;
LASSERT(och->och_magic == OBD_CLIENT_HANDLE_MAGIC);
- file_fh = &och->och_fh;
+ file_open_handle = &och->och_open_handle;
CDEBUG(D_HA, "updating handle from %#llx to %#llx\n",
- file_fh->cookie, body->mbo_handle.cookie);
- old = *file_fh;
- *file_fh = body->mbo_handle;
+ file_open_handle->cookie, body->mbo_open_handle.cookie);
+ old_open_handle = *file_open_handle;
+ *file_open_handle = body->mbo_open_handle;
}
close_req = mod->mod_close_req;
@@ -635,10 +635,11 @@ void mdc_replay_open(struct ptlrpc_request *req)
LASSERT(epoch);
if (req->rq_early_free_repbuf)
- LASSERT(!memcmp(&old, &epoch->mio_handle, sizeof(old)));
+ LASSERT(old_open_handle.cookie ==
+ epoch->mio_open_handle.cookie);
DEBUG_REQ(D_HA, close_req, "updating close body with new fh");
- epoch->mio_handle = body->mbo_handle;
+ epoch->mio_open_handle = body->mbo_open_handle;
}
}
@@ -722,11 +723,12 @@ int mdc_set_open_replay_data(struct obd_export *exp,
}
rec->cr_fid2 = body->mbo_fid1;
- rec->cr_old_handle.cookie = body->mbo_handle.cookie;
+ rec->cr_open_handle_old = body->mbo_open_handle;
open_req->rq_replay_cb = mdc_replay_open;
if (!fid_is_sane(&body->mbo_fid1)) {
DEBUG_REQ(D_ERROR, open_req,
- "Saving replay request with insane fid");
+ "saving replay request with insane FID " DFID,
+ PFID(&body->mbo_fid1));
LBUG();
}
@@ -774,7 +776,7 @@ static int mdc_clear_open_replay_data(struct obd_export *exp,
spin_lock(&mod->mod_open_req->rq_lock);
if (mod->mod_och)
- mod->mod_och->och_fh.cookie = 0;
+ mod->mod_och->och_open_handle.cookie = 0;
mod->mod_open_req->rq_early_free_repbuf = 0;
spin_unlock(&mod->mod_open_req->rq_lock);
mdc_free_open(mod);
@@ -1770,7 +1770,7 @@ void lustre_swab_mdt_body(struct mdt_body *b)
void lustre_swab_mdt_ioepoch(struct mdt_ioepoch *b)
{
/* handle is opaque */
- /* mio_handle is opaque */
+ /* mio_open_handle is opaque */
BUILD_BUG_ON(!offsetof(typeof(*b), mio_unused1));
BUILD_BUG_ON(!offsetof(typeof(*b), mio_unused2));
BUILD_BUG_ON(!offsetof(typeof(*b), mio_padding));
@@ -1961,10 +1961,10 @@ void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct mdt_body, mbo_fid2));
LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_fid2) == 16, "found %lld\n",
(long long)(int)sizeof(((struct mdt_body *)0)->mbo_fid2));
- LASSERTF((int)offsetof(struct mdt_body, mbo_handle) == 32, "found %lld\n",
- (long long)(int)offsetof(struct mdt_body, mbo_handle));
- LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_handle) == 8, "found %lld\n",
- (long long)(int)sizeof(((struct mdt_body *)0)->mbo_handle));
+ LASSERTF((int)offsetof(struct mdt_body, mbo_open_handle) == 32, "found %lld\n",
+ (long long)(int)offsetof(struct mdt_body, mbo_open_handle));
+ LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_open_handle) == 8, "found %lld\n",
+ (long long)(int)sizeof(((struct mdt_body *)0)->mbo_open_handle));
LASSERTF((int)offsetof(struct mdt_body, mbo_valid) == 40, "found %lld\n",
(long long)(int)offsetof(struct mdt_body, mbo_valid));
LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_valid) == 8, "found %lld\n",
@@ -2162,10 +2162,10 @@ void lustre_assert_wire_constants(void)
/* Checks for struct mdt_ioepoch */
LASSERTF((int)sizeof(struct mdt_ioepoch) == 24, "found %lld\n",
(long long)(int)sizeof(struct mdt_ioepoch));
- LASSERTF((int)offsetof(struct mdt_ioepoch, mio_handle) == 0, "found %lld\n",
- (long long)(int)offsetof(struct mdt_ioepoch, mio_handle));
- LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_handle) == 8, "found %lld\n",
- (long long)(int)sizeof(((struct mdt_ioepoch *)0)->mio_handle));
+ LASSERTF((int)offsetof(struct mdt_ioepoch, mio_open_handle) == 0, "found %lld\n",
+ (long long)(int)offsetof(struct mdt_ioepoch, mio_open_handle));
+ LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_open_handle) == 8, "found %lld\n",
+ (long long)(int)sizeof(((struct mdt_ioepoch *)0)->mio_open_handle));
LASSERTF((int)offsetof(struct mdt_ioepoch, mio_unused1) == 8, "found %lld\n",
(long long)(int)offsetof(struct mdt_ioepoch, mio_unused1));
LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_unused1) == 8, "found %lld\n",
@@ -2334,10 +2334,10 @@ void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct mdt_rec_create, cr_fid2));
LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fid2) == 16, "found %lld\n",
(long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_fid2));
- LASSERTF((int)offsetof(struct mdt_rec_create, cr_old_handle) == 72, "found %lld\n",
- (long long)(int)offsetof(struct mdt_rec_create, cr_old_handle));
- LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_old_handle) == 8, "found %lld\n",
- (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_old_handle));
+ LASSERTF((int)offsetof(struct mdt_rec_create, cr_open_handle_old) == 72, "found %lld\n",
+ (long long)(int)offsetof(struct mdt_rec_create, cr_open_handle_old));
+ LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_open_handle_old) == 8, "found %lld\n",
+ (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_open_handle_old));
LASSERTF((int)offsetof(struct mdt_rec_create, cr_time) == 80, "found %lld\n",
(long long)(int)offsetof(struct mdt_rec_create, cr_time));
LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_time) == 8, "found %lld\n",
@@ -1574,7 +1574,7 @@ enum md_transient_state {
struct mdt_body {
struct lu_fid mbo_fid1;
struct lu_fid mbo_fid2;
- struct lustre_handle mbo_handle;
+ struct lustre_handle mbo_open_handle;
__u64 mbo_valid;
__u64 mbo_size; /* Offset, in the case of MDS_READPAGE */
__s64 mbo_mtime;
@@ -1612,7 +1612,7 @@ struct mdt_body {
}; /* 216 */
struct mdt_ioepoch {
- struct lustre_handle mio_handle;
+ struct lustre_handle mio_open_handle;
__u64 mio_unused1; /* was ioepoch */
__u32 mio_unused2; /* was flags */
__u32 mio_padding;
@@ -1719,9 +1719,9 @@ struct mdt_rec_create {
__u32 cr_suppgid1_h;
__u32 cr_suppgid2;
__u32 cr_suppgid2_h;
- struct lu_fid cr_fid1;
- struct lu_fid cr_fid2;
- struct lustre_handle cr_old_handle; /* handle in case of open replay */
+ struct lu_fid cr_fid1;
+ struct lu_fid cr_fid2;
+ struct lustre_handle cr_open_handle_old; /* in case of open replay */
__s64 cr_time;
__u64 cr_rdev;
__u64 cr_ioepoch;
@@ -1864,7 +1864,7 @@ struct mdt_rec_resync {
__u32 rs_suppgid2_h;
struct lu_fid rs_fid;
__u8 rs_padding0[sizeof(struct lu_fid)];
- struct lustre_handle rs_handle; /* rr_mtime */
+ struct lustre_handle rs_lease_handle; /* rr_mtime */
__s64 rs_padding1; /* rr_atime */
__s64 rs_padding2; /* rr_ctime */
__u64 rs_padding3; /* rr_size */