From: Nikolay Borisov <nborisov@suse.com>
To: linux-xfs@vger.kernel.org
Cc: Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH] xfs: Remove duplicated check
Date: Tue, 20 Feb 2018 15:53:02 +0200 [thread overview]
Message-ID: <1519134782-10062-1-git-send-email-nborisov@suse.com> (raw)
The check performed before the memcpy responsible for copying the rest
of the inode is already performed before we call xfs_log_dinode_to_disk.
So let's remove the 2nd instance of the check. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reported-by: Jeff Mahoney <jeffm@suse.com>
---
fs/xfs/xfs_log_recover.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 00240c9ee72e..88dccfb1de96 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3174,11 +3174,8 @@ xlog_recover_inode_pass2(
xfs_log_dinode_to_disk(ldip, dip);
/* the rest is in on-disk format */
- if (item->ri_buf[1].i_len > isize) {
- memcpy((char *)dip + isize,
- item->ri_buf[1].i_addr + isize,
+ memcpy((char *)dip + isize, item->ri_buf[1].i_addr + isize,
item->ri_buf[1].i_len - isize);
- }
fields = in_f->ilf_fields;
if (fields & XFS_ILOG_DEV)
--
2.7.4
next reply other threads:[~2018-02-20 13:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-20 13:53 Nikolay Borisov [this message]
2018-02-20 16:39 ` [PATCH] xfs: Remove duplicated check Darrick J. Wong
2018-02-20 21:11 ` Dave Chinner
2018-02-21 6:30 ` Nikolay Borisov
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=1519134782-10062-1-git-send-email-nborisov@suse.com \
--to=nborisov@suse.com \
--cc=linux-xfs@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).