All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jia He <justin.he@arm.com>
To: linux-kernel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Christoph Hellwig <hch@infradead.org>,
	nd@arm.com, Jia He <justin.he@arm.com>,
	Felipe Balbi <balbi@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Chen Lin <chen.lin5@zte.com.cn>,
	linux-usb@vger.kernel.org
Subject: [PATCH RFC 10/13] usb: gadget: simplify the printing with '%pD' specifier
Date: Thu, 15 Jul 2021 11:15:30 +0800	[thread overview]
Message-ID: <20210715031533.9553-11-justin.he@arm.com> (raw)
In-Reply-To: <20210715031533.9553-1-justin.he@arm.com>

After the behavior of '%pD' is changed to print the full path of file,
the log printing in fsg_common_create_lun() can be simplified.

Given the space with proper length would be allocated in vprintk_store(),
it is worthy of dropping kmalloc()/kfree() to avoid additional space
allocation. The error case is well handled in d_path_unsafe(), the error
string would be copied in '%pD' buffer, no need to additionally handle
IS_ERR().

Cc: Felipe Balbi <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Chen Lin <chen.lin5@zte.com.cn>
Cc: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Jia He <justin.he@arm.com>
---
 drivers/usb/gadget/function/f_mass_storage.c | 28 ++++++++------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index 4a4703634a2a..04d4e8a0f6fd 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -2738,7 +2738,6 @@ int fsg_common_create_lun(struct fsg_common *common, struct fsg_lun_config *cfg,
 			  const char **name_pfx)
 {
 	struct fsg_lun *lun;
-	char *pathbuf, *p;
 	int rc = -ENOMEM;
 
 	if (id >= ARRAY_SIZE(common->luns))
@@ -2790,22 +2789,17 @@ int fsg_common_create_lun(struct fsg_common *common, struct fsg_lun_config *cfg,
 			goto error_lun;
 	}
 
-	pathbuf = kmalloc(PATH_MAX, GFP_KERNEL);
-	p = "(no medium)";
-	if (fsg_lun_is_open(lun)) {
-		p = "(error)";
-		if (pathbuf) {
-			p = file_path(lun->filp, pathbuf, PATH_MAX);
-			if (IS_ERR(p))
-				p = "(error)";
-		}
-	}
-	pr_info("LUN: %s%s%sfile: %s\n",
-	      lun->removable ? "removable " : "",
-	      lun->ro ? "read only " : "",
-	      lun->cdrom ? "CD-ROM " : "",
-	      p);
-	kfree(pathbuf);
+	if (fsg_lun_is_open(lun))
+		pr_info("LUN: %s%s%sfile: %pD\n",
+			lun->removable ? "removable " : "",
+			lun->ro ? "read only " : "",
+			lun->cdrom ? "CD-ROM " : "",
+			lun->filp);
+	else
+		pr_info("LUN: %s%s%sfile: (no medium)\n",
+			lun->removable ? "removable " : "",
+			lun->ro ? "read only " : "",
+			lun->cdrom ? "CD-ROM " : "");
 
 	return 0;
 
-- 
2.17.1


  parent reply	other threads:[~2021-07-15  3:16 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-15  3:15 [PATCH RFC 00/13] Simplify the print format string with new '%pD' Jia He
2021-07-15  3:15 ` [PATCH RFC 01/13] s390/hmcdrv: remove the redundant directory path in format string Jia He
2021-07-15  3:15 ` [PATCH RFC 02/13] afs: Remove the number postfix of '%pD' " Jia He
2021-07-15  3:15 ` [PATCH RFC 03/13] fs: " Jia He
2021-07-15  3:15 ` [PATCH RFC 04/13] NFS: " Jia He
2021-07-15  3:15 ` [PATCH RFC 05/13] NFSD: " Jia He
2021-07-15  3:15 ` [PATCH RFC 06/13] ovl: remove " Jia He
2021-07-15  3:15 ` [PATCH RFC 07/13] iomap: simplify iomap_swapfile_fail() with '%pD' specifier Jia He
2021-07-15 17:11   ` Darrick J. Wong
2021-07-16  6:11   ` Christoph Hellwig
2021-07-16  6:17     ` Justin He
2021-07-15  3:15 ` [PATCH RFC 08/13] fs/coredump: simplify the printing with '%pD' and '%pd' specifier Jia He
2021-07-15  3:15 ` [PATCH RFC 09/13] mm/filemap: simplify the printing with '%pD' specifier Jia He
2021-07-15  3:15 ` Jia He [this message]
2021-07-15  7:26   ` [PATCH RFC 10/13] usb: gadget: " Felipe Balbi
2021-07-15  8:10   ` Greg Kroah-Hartman
2021-07-15  3:15 ` [PATCH RFC 11/13] md/bitmap: " Jia He
2021-07-16  9:38   ` Guoqing Jiang
2021-07-23 17:05     ` Song Liu
2021-07-15  3:15 ` [PATCH RFC 12/13] mm: simplify the printing with '%pd' specifier Jia He
2021-07-15  3:15 ` [PATCH RFC 13/13] ext4: simplify the printing with '%pD' specifier Jia He

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210715031533.9553-11-justin.he@arm.com \
    --to=justin.he@arm.com \
    --cc=balbi@kernel.org \
    --cc=chen.lin5@zte.com.cn \
    --cc=gregkh@linuxfoundation.org \
    --cc=gustavoars@kernel.org \
    --cc=hch@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=nd@arm.com \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.