Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a4cd3e9 authored by Srikrishan Malik's avatar Srikrishan Malik Committed by Greg Kroah-Hartman
Browse files

staging: lustre: Fix misplaced opening brace warnings 



Fixes the following checkpatch error:

ERROR: that open brace { should be on the previous line

Signed-off-by: default avatarSrikrishan Malik <srikrishanmalik@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c35e01ff

drivers/staging/lustre/lustre/mdc/mdc_locks.c

+11 −7
Original line number Diff line number Diff line
@@ -785,14 +785,18 @@ int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, 
	__u64		  flags, saved_flags = extra_lock_flags;

	int		    rc;

	struct ldlm_res_id res_id;

	static const ldlm_policy_data_t lookup_policy =

			    { .l_inodebits = { MDS_INODELOCK_LOOKUP } };

	static const ldlm_policy_data_t update_policy =

			    { .l_inodebits = { MDS_INODELOCK_UPDATE } };

	static const ldlm_policy_data_t layout_policy =

			    { .l_inodebits = { MDS_INODELOCK_LAYOUT } };

	static const ldlm_policy_data_t lookup_policy = {

		.l_inodebits = { MDS_INODELOCK_LOOKUP }

	};

	static const ldlm_policy_data_t update_policy = {

		.l_inodebits = { MDS_INODELOCK_UPDATE }

	};

	static const ldlm_policy_data_t layout_policy = {

		.l_inodebits = { MDS_INODELOCK_LAYOUT }

	};

	static const ldlm_policy_data_t getxattr_policy = {

			      .l_inodebits = { MDS_INODELOCK_XATTR } };

		.l_inodebits = { MDS_INODELOCK_XATTR }

	};

	ldlm_policy_data_t const *policy = &lookup_policy;

	int		    generation, resends = 0;

	struct ldlm_reply     *lockrep;

drivers/staging/lustre/lustre/mdc/mdc_reint.c

+1 −2
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data, 


	ptlrpc_request_set_replen(req);

	if (mod && (op_data->op_flags & MF_EPOCH_OPEN) &&

	    req->rq_import->imp_replayable)

	{

	    req->rq_import->imp_replayable) {

		LASSERT(*mod == NULL);



		*mod = obd_mod_alloc();

drivers/staging/lustre/lustre/mdc/mdc_request.c

+5 −2
Original line number Diff line number Diff line
@@ -1794,8 +1794,11 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len, 
		GOTO(out, rc);

	case OBD_IOC_CHANGELOG_CLEAR: {

		struct ioc_changelog *icc = karg;

		struct changelog_setinfo cs =

			{.cs_recno = icc->icc_recno, .cs_id = icc->icc_id};

		struct changelog_setinfo cs = {

			.cs_recno = icc->icc_recno,

			.cs_id = icc->icc_id

		};



		rc = obd_set_info_async(NULL, exp, strlen(KEY_CHANGELOG_CLEAR),

					KEY_CHANGELOG_CLEAR, sizeof(cs), &cs,

					NULL);