From: Allison Collins <allison.henderson@oracle.com>
To: Eric Sandeen <sandeen@sandeen.net>,
Eric Sandeen <sandeen@redhat.com>,
linux-xfs <linux-xfs@vger.kernel.org>
Subject: Re: [PATCH 5/3] libxfs: rename bli_format to avoid confusion with bli_formats
Date: Fri, 17 May 2019 16:41:59 -0700 [thread overview]
Message-ID: <cb536d8f-16d1-e456-9566-19894fb12158@oracle.com> (raw)
In-Reply-To: <1717fd26-ba67-e5c0-c906-0b84c1970250@sandeen.net>
On 5/17/19 4:01 PM, Eric Sandeen wrote:
> On 5/17/19 5:29 PM, Allison Collins wrote:
>> On 5/16/19 1:39 PM, Eric Sandeen wrote:
>>> Rename the bli_format structure to __bli_format to avoid
>>> accidently confusing them with the bli_formats pointer.
>>>
>>> (nb: userspace currently has no bli_formats pointer)
>>>
>>> Source kernel commit: b94381737e9c4d014a4003e8ece9ba88670a2dd4
>>>
>>> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
>>> ---
>>> include/xfs_trans.h | 2 +-
>>> libxfs/logitem.c | 6 +++---
>>> libxfs/trans.c | 4 ++--
>>> 3 files changed, 6 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/include/xfs_trans.h b/include/xfs_trans.h
>>> index 953da5d1..fe03ba64 100644
>>> --- a/include/xfs_trans.h
>>> +++ b/include/xfs_trans.h
>>> @@ -39,7 +39,7 @@ typedef struct xfs_buf_log_item {
>>> struct xfs_buf *bli_buf; /* real buffer pointer */
>>> unsigned int bli_flags; /* misc flags */
>>> unsigned int bli_recur; /* recursion count */
>>> - xfs_buf_log_format_t bli_format; /* in-log header */
>>> + xfs_buf_log_format_t __bli_format; /* in-log header */
>>> } xfs_buf_log_item_t;
>>> #define XFS_BLI_DIRTY (1<<0)
>>> diff --git a/libxfs/logitem.c b/libxfs/logitem.c
>>> index 4da9bc1b..e862ab4f 100644
>>> --- a/libxfs/logitem.c
>>> +++ b/libxfs/logitem.c
>>> @@ -107,9 +107,9 @@ xfs_buf_item_init(
>>> bip->bli_item.li_mountp = mp;
>>> INIT_LIST_HEAD(&bip->bli_item.li_trans);
>>> bip->bli_buf = bp;
>>> - bip->bli_format.blf_type = XFS_LI_BUF;
>>> - bip->bli_format.blf_blkno = (int64_t)XFS_BUF_ADDR(bp);
>>> - bip->bli_format.blf_len = (unsigned short)BTOBB(bp->b_bcount);
>>> + bip->__bli_format.blf_type = XFS_LI_BUF;
>>> + bip->__bli_format.blf_blkno = (int64_t)XFS_BUF_ADDR(bp);
>>> + bip->__bli_format.blf_len = (unsigned short)BTOBB(bp->b_bcount);
>>> bp->b_log_item = bip;
>>
>> I had a look around this area of code, and I see where the bli_format is getting referenced, but I don't see a bli_formats. So I feel like I'm missing the motivation for the change. Did I miss the bli_formats somewhere? Thanks!
>
> see above :)
>
>> (nb: userspace currently has no bli_formats pointer)
>
> (I guess copying the kernel commit log added confusion even w/ the note)
>
> -Eric
Oh I see. No I think it's ok, I overlooked it. You can add my review :-)
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
>
next prev parent reply other threads:[~2019-05-17 23:42 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 17:42 [PATCH 0/3] xfsprogs: more libxfs/ spring cleaning Eric Sandeen
2019-05-16 17:43 ` [PATCH 1/3] libxfs: rename shared kernel functions from libxfs_ to xfs_ Eric Sandeen
2019-05-17 20:49 ` Allison Collins
2019-05-17 21:00 ` Eric Sandeen
2019-05-16 17:45 ` [PATCH 2/3] libxfs: remove libxfs API #defines for unexported xfs functions Eric Sandeen
2019-05-17 21:06 ` Allison Collins
2019-05-16 17:46 ` [PATCH 3/3] xfsprogs: remove unused flags arg from getsb interfaces Eric Sandeen
2019-05-17 21:09 ` Allison Collins
2019-05-16 20:38 ` [PATCH 4/3] libxfs: Remove XACT_DEBUG #ifdefs Eric Sandeen
2019-05-17 21:36 ` Allison Collins
2019-05-20 22:53 ` Darrick J. Wong
2019-05-16 20:39 ` [PATCH 5/3] libxfs: rename bli_format to avoid confusion with bli_formats Eric Sandeen
2019-05-17 22:29 ` Allison Collins
2019-05-17 23:01 ` Eric Sandeen
2019-05-17 23:41 ` Allison Collins [this message]
2019-05-16 20:39 ` [PATCH 6/3] libxfs: factor common xfs_trans_bjoin code Eric Sandeen
2019-05-17 22:56 ` Allison Collins
2019-05-20 22:56 ` Darrick J. Wong
2019-05-20 22:58 ` Eric Sandeen
2019-05-20 23:12 ` Darrick J. Wong
2019-05-16 20:40 ` [PATCH 7/3] libxfs: fix argument to xfs_trans_add_item Eric Sandeen
2019-05-17 22:57 ` Allison Collins
2019-05-16 20:41 ` [PATCH 8/3] xfs: factor log item initialisation Eric Sandeen
2019-05-17 23:50 ` Allison Collins
2019-05-17 19:46 ` [PATCH 9/3] libxfs: create current_time helper and sync xfs_trans_ichgtime Eric Sandeen
2019-05-17 19:50 ` [PATCH 10/3] libxfs: share kernel's xfs_trans_inode.c Eric Sandeen
2019-05-20 23:00 ` Darrick J. Wong
2019-05-20 23:03 ` [PATCH 0/3] xfsprogs: more libxfs/ spring cleaning Darrick J. Wong
2019-05-20 23:10 ` Darrick J. Wong
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=cb536d8f-16d1-e456-9566-19894fb12158@oracle.com \
--to=allison.henderson@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.com \
--cc=sandeen@sandeen.net \
/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