Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4840 lfs: Use file lease to implement migration
[fs/lustre-release.git]
/
lustre
/
mdc
/
mdc_request.c
diff --git
a/lustre/mdc/mdc_request.c
b/lustre/mdc/mdc_request.c
index
05f6b7e
..
82bc3c1
100644
(file)
--- a/
lustre/mdc/mdc_request.c
+++ b/
lustre/mdc/mdc_request.c
@@
-833,9
+833,8
@@
static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
int saved_rc = 0;
ENTRY;
int saved_rc = 0;
ENTRY;
- req_fmt = &RQF_MDS_CLOSE;
if (op_data->op_bias & MDS_HSM_RELEASE) {
if (op_data->op_bias & MDS_HSM_RELEASE) {
- req_fmt = &RQF_MDS_
RELEASE
_CLOSE;
+ req_fmt = &RQF_MDS_
INTENT
_CLOSE;
/* allocate a FID for volatile file */
rc = mdc_fid_alloc(NULL, exp, &op_data->op_fid2, op_data);
/* allocate a FID for volatile file */
rc = mdc_fid_alloc(NULL, exp, &op_data->op_fid2, op_data);
@@
-845,6
+844,10
@@
static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
/* save the errcode and proceed to close */
saved_rc = rc;
}
/* save the errcode and proceed to close */
saved_rc = rc;
}
+ } else if (op_data->op_bias & MDS_CLOSE_LAYOUT_SWAP) {
+ req_fmt = &RQF_MDS_INTENT_CLOSE;
+ } else {
+ req_fmt = &RQF_MDS_CLOSE;
}
*request = NULL;
}
*request = NULL;