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
Revert "LU-4640 mdt: implement Remove Archive on Last Unlink policy"
[fs/lustre-release.git]
/
lustre
/
mdt
/
mdt_hsm.c
diff --git
a/lustre/mdt/mdt_hsm.c
b/lustre/mdt/mdt_hsm.c
index
a5220a1
..
d4cf668
100644
(file)
--- a/
lustre/mdt/mdt_hsm.c
+++ b/
lustre/mdt/mdt_hsm.c
@@
-22,9
+22,9
@@
/*
* Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies
* alternatives
/*
* Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies
* alternatives
- *
- * Copyright (c) 2012, 2014, Intel Corporation.
* Use is subject to license terms.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2015, Intel Corporation.
*/
/*
* lustre/mdt/mdt_hsm.c
*/
/*
* lustre/mdt/mdt_hsm.c
@@
-214,8
+214,7
@@
int mdt_hsm_state_get(struct tgt_session_info *tsi)
lh = &info->mti_lh[MDT_LH_CHILD];
mdt_lock_reg_init(lh, LCK_PR);
lh = &info->mti_lh[MDT_LH_CHILD];
mdt_lock_reg_init(lh, LCK_PR);
- rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP,
- MDT_LOCAL_LOCK);
+ rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP);
if (rc < 0)
GOTO(out_ucred, rc);
if (rc < 0)
GOTO(out_ucred, rc);
@@
-225,11
+224,6
@@
int mdt_hsm_state_get(struct tgt_session_info *tsi)
if (rc)
GOTO(out_unlock, rc);
if (rc)
GOTO(out_unlock, rc);
- if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
- mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1,
- req_capsule_client_get(info->mti_pill,
- &RMF_CAPA1));
-
hus = req_capsule_server_get(tsi->tsi_pill, &RMF_HSM_USER_STATE);
if (hus == NULL)
GOTO(out_unlock, rc = -EPROTO);
hus = req_capsule_server_get(tsi->tsi_pill, &RMF_HSM_USER_STATE);
if (hus == NULL)
GOTO(out_unlock, rc = -EPROTO);
@@
-253,7
+247,7
@@
out:
*
* Archive number is changed iif the value is not 0.
* The new flagset that will be computed should result in a coherent state.
*
* Archive number is changed iif the value is not 0.
* The new flagset that will be computed should result in a coherent state.
- * This function checks that
are
flags are compatible.
+ * This function checks that flags are compatible.
*
* This is MDS_HSM_STATE_SET RPC handler.
*/
*
* This is MDS_HSM_STATE_SET RPC handler.
*/
@@
-281,14
+275,10
@@
int mdt_hsm_state_set(struct tgt_session_info *tsi)
lh = &info->mti_lh[MDT_LH_CHILD];
mdt_lock_reg_init(lh, LCK_PW);
rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP |
lh = &info->mti_lh[MDT_LH_CHILD];
mdt_lock_reg_init(lh, LCK_PW);
rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP |
- MDS_INODELOCK_XATTR
, MDT_LOCAL_LOCK
);
+ MDS_INODELOCK_XATTR);
if (rc < 0)
GOTO(out_ucred, rc);
if (rc < 0)
GOTO(out_ucred, rc);
- if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
- mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1,
- req_capsule_client_get(info->mti_pill, &RMF_CAPA1));
-
/* Detect out-of range masks */
if ((hss->hss_setmask | hss->hss_clearmask) & ~HSM_FLAGS_MASK) {
CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
/* Detect out-of range masks */
if ((hss->hss_setmask | hss->hss_clearmask) & ~HSM_FLAGS_MASK) {
CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
@@
-402,11
+392,6
@@
int mdt_hsm_action(struct tgt_session_info *tsi)
if (rc)
GOTO(out, rc = err_serious(rc));
if (rc)
GOTO(out, rc = err_serious(rc));
- if (req_capsule_get_size(tsi->tsi_pill, &RMF_CAPA1, RCL_CLIENT))
- mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1,
- req_capsule_client_get(info->mti_pill,
- &RMF_CAPA1));
-
/* Coordinator information */
hal_size = sizeof(*hal) +
cfs_size_round(MTI_NAME_MAXLEN) /* fsname */ +
/* Coordinator information */
hal_size = sizeof(*hal) +
cfs_size_round(MTI_NAME_MAXLEN) /* fsname */ +