From: Andreas Gruenbacher <agruenba@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 6/8] gfs2: Rename size to len in gfs2_alloc_size
Date: Tue, 28 Aug 2018 23:47:29 +0200 [thread overview]
Message-ID: <20180828214731.15199-7-agruenba@redhat.com> (raw)
In-Reply-To: <20180828214731.15199-1-agruenba@redhat.com>
A simple variable rename.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/gfs2/bmap.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 7d5fa46f648b..5168e5c39d49 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -806,33 +806,33 @@ static u64 gfs2_alloc_size(struct inode *inode, struct metapath *mp,
{
struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_sbd *sdp = GFS2_SB(inode);
- u64 size = iomap->length >> inode->i_blkbits;
+ u64 len = iomap->length >> inode->i_blkbits;
if (gfs2_is_stuffed(ip) || mp->mp_fheight != mp->mp_aheight) {
- unsigned int maxsize;
+ unsigned int maxlen;
- maxsize = mp->mp_fheight > 1 ? sdp->sd_inptrs : sdp->sd_diptrs;
- maxsize -= mp->mp_list[mp->mp_fheight - 1];
+ maxlen = mp->mp_fheight > 1 ? sdp->sd_inptrs : sdp->sd_diptrs;
+ maxlen -= mp->mp_list[mp->mp_fheight - 1];
if (gfs2_inode_contains_data(inode)) {
if (iomap->offset == 0)
- maxsize = 1;
+ maxlen = 1;
}
- if (size > maxsize)
- size = maxsize;
+ if (len > maxlen)
+ len = maxlen;
} else {
const __be64 *first, *ptr, *end;
first = metapointer(ip->i_height - 1, mp);
end = metaend(ip->i_height - 1, mp);
- if (end - first > size)
- end = first + size;
+ if (end - first > len)
+ end = first + len;
for (ptr = first; ptr < end; ptr++) {
if (*ptr)
break;
}
- size = ptr - first;
+ len = ptr - first;
}
- return size;
+ return len;
}
/**
--
2.17.1
next prev parent reply other threads:[~2018-08-28 21:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-28 21:47 [Cluster-devel] [PATCH 0/8] Get rid of gfs2_write_calc_reserv in gfs2_iomap_begin_write Andreas Gruenbacher
2018-08-28 21:47 ` [Cluster-devel] [PATCH 1/8] gfs2: Don't depend on mp_aheight in clone_metapath Andreas Gruenbacher
2018-08-28 21:47 ` [Cluster-devel] [PATCH 2/8] gfs2: Split gfs2_indirect_init Andreas Gruenbacher
2018-08-28 21:47 ` [Cluster-devel] [PATCH 3/8] gfs2: Move empty inode check out of gfs2_unstuff_dinode Andreas Gruenbacher
2018-08-28 21:47 ` [Cluster-devel] [PATCH 4/8] gfs2: Don't create unnecessary indirect blocks Andreas Gruenbacher
2018-08-28 21:47 ` [Cluster-devel] [PATCH 5/8] gfs2: Improve gfs2_alloc_size for stuffed files Andreas Gruenbacher
2018-08-28 21:47 ` Andreas Gruenbacher [this message]
2018-08-28 21:47 ` [Cluster-devel] [PATCH 7/8] gfs2: Move gfs2_alloc_size out of gfs2_iomap_get Andreas Gruenbacher
2018-08-28 21:47 ` [Cluster-devel] [PATCH 8/8] gfs2: Get rid of gfs2_write_calc_reserv in gfs2_iomap_begin_write Andreas Gruenbacher
2018-08-29 10:12 ` [Cluster-devel] [PATCH 0/8] " Steven Whitehouse
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=20180828214731.15199-7-agruenba@redhat.com \
--to=agruenba@redhat.com \
/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).