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

Commit 65a20cc1 authored by Aastha Gupta's avatar Aastha Gupta Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: fix coding style for error messages 



The "DFID" part should be added to the same line as the rest of
the message, to match current coding style.

Signed-off-by: default avatarAastha Gupta <aastha.gupta4104@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9f11748c

drivers/staging/lustre/lustre/llite/dir.c

+5 −6
Original line number Diff line number Diff line
@@ -734,8 +734,8 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy) 
		rc = ll_data_version(inode, &data_version, LL_DV_RD_FLUSH);

		iput(inode);

		if (rc != 0) {

			CDEBUG(D_HSM, "Could not read file data version of "

				      DFID " (rc = %d). Archive request (%#llx) could not be done.\n",

			CDEBUG(D_HSM,

			       "Could not read file data version of " DFID " (rc = %d). Archive request (%#llx) could not be done.\n",

			       PFID(&copy->hc_hai.hai_fid), rc,

			       copy->hc_hai.hai_cookie);

			hpk.hpk_flags |= HP_FLAG_RETRY;
@@ -835,8 +835,7 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy) 
		 */

		if ((copy->hc_hai.hai_action == HSMA_ARCHIVE) &&

		    (copy->hc_data_version != data_version)) {

			CDEBUG(D_HSM, "File data version mismatched. File content was changed during archiving. "

			       DFID ", start:%#llx current:%#llx\n",

			CDEBUG(D_HSM, "File data version mismatched. File content was changed during archiving. " DFID ", start:%#llx current:%#llx\n",

			       PFID(&copy->hc_hai.hai_fid),

			       copy->hc_data_version, data_version);

			/* File was changed, send error to cdt. Do not ask for