Commit 3437819c authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Andrew Morton
Browse files

ocfs2: avoid extra calls to strlen() after ocfs2_sprintf_system_inode_name() 

Since 'ocfs2_sprintf_system_inode_name()' uses 'snprintf()' and returns
the number of characters emitted, callers of the former are better to use
that return value instead of an explicit calls to 'strlen()'.

Link: https://lkml.kernel.org/r/20250917060229.1854335-1-dmantipov@yandex.ru


Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: default avatarJoel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a15f37a4

fs/ocfs2/ioctl.c

+7 −11
Original line number Diff line number Diff line
@@ -358,13 +358,11 @@ static int ocfs2_info_handle_freeinode(struct inode *inode, 
				goto bail;

			}

		} else {

			ocfs2_sprintf_system_inode_name(namebuf,

			int len = ocfs2_sprintf_system_inode_name(namebuf,

								  sizeof(namebuf),

								  type, i);

			status = ocfs2_lookup_ino_from_name(osb->sys_root_inode,

							    namebuf,

							    strlen(namebuf),

							    &blkno);

							    namebuf, len, &blkno);

			if (status < 0) {

				status = -ENOENT;

				goto bail;
@@ -651,12 +649,10 @@ static int ocfs2_info_handle_freefrag(struct inode *inode, 
			goto bail;

		}

	} else {

		ocfs2_sprintf_system_inode_name(namebuf, sizeof(namebuf), type,

						OCFS2_INVALID_SLOT);

		int len = ocfs2_sprintf_system_inode_name(namebuf, sizeof(namebuf),

							  type, OCFS2_INVALID_SLOT);

		status = ocfs2_lookup_ino_from_name(osb->sys_root_inode,

						    namebuf,

						    strlen(namebuf),

						    &blkno);

						    namebuf, len, &blkno);

		if (status < 0) {

			status = -ENOENT;

			goto bail;

fs/ocfs2/move_extents.c

+4 −4
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode, 
					 int *vict_bit,

					 struct buffer_head **ret_bh)

{

	int ret, i, bits_per_unit = 0;

	int ret, i, len, bits_per_unit = 0;

	u64 blkno;

	char namebuf[40];
@@ -375,9 +375,9 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode, 
	struct ocfs2_dinode *ac_dinode;

	struct ocfs2_group_desc *bg;



	ocfs2_sprintf_system_inode_name(namebuf, sizeof(namebuf), type, slot);

	ret = ocfs2_lookup_ino_from_name(osb->sys_root_inode, namebuf,

					 strlen(namebuf), &blkno);

	len = ocfs2_sprintf_system_inode_name(namebuf, sizeof(namebuf), type, slot);

	ret = ocfs2_lookup_ino_from_name(osb->sys_root_inode, namebuf, len, &blkno);



	if (ret) {

		ret = -ENOENT;

		goto out;

fs/ocfs2/sysfile.c

+6 −6
Original line number Diff line number Diff line
@@ -127,14 +127,14 @@ static struct inode * _ocfs2_get_system_file_inode(struct ocfs2_super *osb, 
	char namebuf[40];

	struct inode *inode = NULL;

	u64 blkno;

	int status = 0;

	int len, status = 0;



	ocfs2_sprintf_system_inode_name(namebuf,

	len = ocfs2_sprintf_system_inode_name(namebuf,

					      sizeof(namebuf),

					      type, slot);



	status = ocfs2_lookup_ino_from_name(osb->sys_root_inode, namebuf,

					    strlen(namebuf), &blkno);

	status = ocfs2_lookup_ino_from_name(osb->sys_root_inode,

					    namebuf, len, &blkno);

	if (status < 0) {

		goto bail;

	}