staging/lustre/lmv: Adjust comments to better conform to coding style (7f05d5bb) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/staging/lustre/lustre/lmv/lmv_fld.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,8 @@ int lmv_fld_lookup(struct lmv_obd *lmv,
	int rc;		int rc;

	/* FIXME: Currently ZFS still use local seq for ROOT unfortunately, and		/* FIXME: Currently ZFS still use local seq for ROOT unfortunately, and
	* this fid_is_local check should be removed once LU-2240 is fixed */		* this fid_is_local check should be removed once LU-2240 is fixed
			*/
	LASSERTF((fid_seq_in_fldb(fid_seq(fid)) \|\|		LASSERTF((fid_seq_in_fldb(fid_seq(fid)) \|\|
	fid_seq_is_local_file(fid_seq(fid))) &&		fid_seq_is_local_file(fid_seq(fid))) &&
	fid_is_sane(fid), DFID" is insane!\n", PFID(fid));		fid_is_sane(fid), DFID" is insane!\n", PFID(fid));

drivers/staging/lustre/lustre/lmv/lmv_intent.c

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -110,11 +110,13 @@ static int lmv_intent_remote(struct obd_export exp, void lmm,
	if (parent_fid) {		if (parent_fid) {
	/* The parent fid is only for remote open to		/* The parent fid is only for remote open to
	* check whether the open is from OBF,		* check whether the open is from OBF,
	* see mdt_cross_open */		* see mdt_cross_open
			*/
	LASSERT(it->it_op & IT_OPEN);		LASSERT(it->it_op & IT_OPEN);
	op_data->op_fid2 = *parent_fid;		op_data->op_fid2 = *parent_fid;
	/* Add object FID to op_fid3, in case it needs to check stale		/* Add object FID to op_fid3, in case it needs to check stale
	* (M_CHECK_STALE), see mdc_finish_intent_lock */		* (M_CHECK_STALE), see mdc_finish_intent_lock
			*/
	op_data->op_fid3 = body->fid1;		op_data->op_fid3 = body->fid1;
	}		}

	@@ -173,7 +175,8 @@ static int lmv_intent_open(struct obd_export exp, struct md_op_data op_data,
	return PTR_ERR(tgt);		return PTR_ERR(tgt);

	/* If it is ready to open the file by FID, do not need		/* If it is ready to open the file by FID, do not need
	* allocate FID at all, otherwise it will confuse MDT */		* allocate FID at all, otherwise it will confuse MDT
			*/
	if ((it->it_op & IT_CREAT) &&		if ((it->it_op & IT_CREAT) &&
	!(it->it_flags & MDS_OPEN_BY_FID)) {		!(it->it_flags & MDS_OPEN_BY_FID)) {
	/*		/*

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+24 −13

Original line number	Original line	Diff line number	Diff line
	@@ -679,7 +679,8 @@ static int lmv_fid2path(struct obd_export exp, int len, void karg,
	goto out_fid2path;		goto out_fid2path;

	/* If remote_gf != NULL, it means just building the		/* If remote_gf != NULL, it means just building the
	* path on the remote MDT, copy this path segment to gf */		* path on the remote MDT, copy this path segment to gf
			*/
	if (remote_gf) {		if (remote_gf) {
	struct getinfo_fid2path *ori_gf;		struct getinfo_fid2path *ori_gf;
	char *ptr;		char *ptr;
	@@ -797,7 +798,8 @@ static int lmv_hsm_ct_unregister(struct lmv_obd *lmv, unsigned int cmd, int len,
	/* unregister request (call from llapi_hsm_copytool_fini) */		/* unregister request (call from llapi_hsm_copytool_fini) */
	for (i = 0; i < lmv->desc.ld_tgt_count; i++) {		for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
	/* best effort: try to clean as much as possible		/* best effort: try to clean as much as possible
	* (continue on error) */		* (continue on error)
			*/
	obd_iocontrol(cmd, lmv->tgts[i]->ltd_exp, len, lk, uarg);		obd_iocontrol(cmd, lmv->tgts[i]->ltd_exp, len, lk, uarg);
	}		}

	@@ -821,7 +823,8 @@ static int lmv_hsm_ct_register(struct lmv_obd *lmv, unsigned int cmd, int len,

	/* All or nothing: try to register to all MDS.		/* All or nothing: try to register to all MDS.
	* In case of failure, unregister from previous MDS,		* In case of failure, unregister from previous MDS,
	* except if it because of inactive target. */		* except if it because of inactive target.
			*/
	for (i = 0; i < lmv->desc.ld_tgt_count; i++) {		for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
	err = obd_iocontrol(cmd, lmv->tgts[i]->ltd_exp,		err = obd_iocontrol(cmd, lmv->tgts[i]->ltd_exp,
	len, lk, uarg);		len, lk, uarg);
	@@ -841,8 +844,8 @@ static int lmv_hsm_ct_register(struct lmv_obd *lmv, unsigned int cmd, int len,
	return rc;		return rc;
	}		}
	/* else: transient error.		/* else: transient error.
	* kuc will register to the missing MDT		* kuc will register to the missing MDT when it is back
	* when it is back */		*/
	} else {		} else {
	any_set = true;		any_set = true;
	}		}
	@@ -1028,7 +1031,8 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,

	/* if the request is about a single fid		/* if the request is about a single fid
	* or if there is a single MDS, no need to split		* or if there is a single MDS, no need to split
	* the request. */		* the request.
			*/
	if (reqcount == 1 \|\| count == 1) {		if (reqcount == 1 \|\| count == 1) {
	tgt = lmv_find_target(lmv,		tgt = lmv_find_target(lmv,
	&hur->hur_user_item[0].hui_fid);		&hur->hur_user_item[0].hui_fid);
	@@ -1104,7 +1108,8 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
	if (!lmv->tgts[i] \|\| !lmv->tgts[i]->ltd_exp)		if (!lmv->tgts[i] \|\| !lmv->tgts[i]->ltd_exp)
	continue;		continue;
	/* ll_umount_begin() sets force flag but for lmv, not		/* ll_umount_begin() sets force flag but for lmv, not
	* mdc. Let's pass it through */		* mdc. Let's pass it through
			*/
	mdc_obd = class_exp2obd(lmv->tgts[i]->ltd_exp);		mdc_obd = class_exp2obd(lmv->tgts[i]->ltd_exp);
	mdc_obd->obd_force = obddev->obd_force;		mdc_obd->obd_force = obddev->obd_force;
	err = obd_iocontrol(cmd, lmv->tgts[i]->ltd_exp, len,		err = obd_iocontrol(cmd, lmv->tgts[i]->ltd_exp, len,
	@@ -1211,7 +1216,8 @@ static int lmv_placement_policy(struct obd_device *obd,
	}		}

	/* Allocate new fid on target according to operation type and parent		/* Allocate new fid on target according to operation type and parent
	* home mds. */		* home mds.
			*/
	*mds = op_data->op_mds;		*mds = op_data->op_mds;
	return 0;		return 0;
	}		}
	@@ -1363,7 +1369,8 @@ static int lmv_process_config(struct obd_device obd, u32 len, void buf)
	switch (lcfg->lcfg_command) {		switch (lcfg->lcfg_command) {
	case LCFG_ADD_MDC:		case LCFG_ADD_MDC:
	/* modify_mdc_tgts add 0:lustre-clilmv 1:lustre-MDT0000_UUID		/* modify_mdc_tgts add 0:lustre-clilmv 1:lustre-MDT0000_UUID
	* 2:0 3:1 4:lustre-MDT0000-mdc_UUID */		* 2:0 3:1 4:lustre-MDT0000-mdc_UUID
			*/
	if (LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(obd_uuid.uuid)) {		if (LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(obd_uuid.uuid)) {
	rc = -EINVAL;		rc = -EINVAL;
	goto out;		goto out;
	@@ -1427,7 +1434,8 @@ static int lmv_statfs(const struct lu_env env, struct obd_export exp,
	* i.e. mount does not need the merged osfs		* i.e. mount does not need the merged osfs
	* from all of MDT.		* from all of MDT.
	* And also clients can be mounted as long as		* And also clients can be mounted as long as
	* MDT0 is in service*/		* MDT0 is in service
			*/
	if (flags & OBD_STATFS_FOR_MDT0)		if (flags & OBD_STATFS_FOR_MDT0)
	goto out_free_temp;		goto out_free_temp;
	} else {		} else {
	@@ -2122,7 +2130,8 @@ static void lmv_adjust_dirpages(struct page **pages, int ncfspgs, int nlupgs)
	break;		break;

	/* Enlarge the end entry lde_reclen from 0 to		/* Enlarge the end entry lde_reclen from 0 to
	* first entry of next lu_dirpage. */		* first entry of next lu_dirpage.
			*/
	LASSERT(le16_to_cpu(end_dirent->lde_reclen) == 0);		LASSERT(le16_to_cpu(end_dirent->lde_reclen) == 0);
	end_dirent->lde_reclen =		end_dirent->lde_reclen =
	cpu_to_le16((char *)(dp->ldp_entries) -		cpu_to_le16((char *)(dp->ldp_entries) -
	@@ -2260,7 +2269,8 @@ static int lmv_unlink(struct obd_export exp, struct md_op_data op_data,
	* 4. Then A will resend unlink RPC to MDT0. (retry 2nd times).		* 4. Then A will resend unlink RPC to MDT0. (retry 2nd times).
	*		*
	* In theory, it might try unlimited time here, but it should		* In theory, it might try unlimited time here, but it should
	* be very rare case. */		* be very rare case.
			*/
	op_data->op_fid2 = body->fid1;		op_data->op_fid2 = body->fid1;
	ptlrpc_req_finished(*request);		ptlrpc_req_finished(*request);
	*request = NULL;		*request = NULL;
	@@ -2275,7 +2285,8 @@ static int lmv_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
	switch (stage) {		switch (stage) {
	case OBD_CLEANUP_EARLY:		case OBD_CLEANUP_EARLY:
	/* XXX: here should be calling obd_precleanup() down to		/* XXX: here should be calling obd_precleanup() down to
	* stack. */		* stack.
			*/
	break;		break;
	case OBD_CLEANUP_EXPORTS:		case OBD_CLEANUP_EXPORTS:
	fld_client_debugfs_fini(&lmv->lmv_fld);		fld_client_debugfs_fini(&lmv->lmv_fld);