From: Brian Foster <bfoster@redhat.com>
To: Pavel Reichl <preichl@redhat.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v11 2/4] xfs: clean up whitespace in xfs_isilocked() calls
Date: Mon, 12 Oct 2020 12:03:18 -0400 [thread overview]
Message-ID: <20201012160318.GI917726@bfoster> (raw)
In-Reply-To: <20201009195515.82889-3-preichl@redhat.com>
On Fri, Oct 09, 2020 at 09:55:13PM +0200, Pavel Reichl wrote:
> Make whitespace follow the same pattern in all xfs_isilocked() calls.
>
> Signed-off-by: Pavel Reichl <preichl@redhat.com>
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_bmap.c | 2 +-
> fs/xfs/xfs_file.c | 3 ++-
> fs/xfs/xfs_inode.c | 4 ++--
> fs/xfs/xfs_qm.c | 2 +-
> 4 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 1b0a01b06a05..ced3b996cd8a 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -3883,7 +3883,7 @@ xfs_bmapi_read(
>
> ASSERT(*nmap >= 1);
> ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK | XFS_BMAPI_ENTIRE)));
> - ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED|XFS_ILOCK_EXCL));
> + ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL));
>
> if (WARN_ON_ONCE(!ifp))
> return -EFSCORRUPTED;
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index a29f78a663ca..c8b1d4e4199a 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -763,7 +763,8 @@ xfs_break_layouts(
> bool retry;
> int error;
>
> - ASSERT(xfs_isilocked(XFS_I(inode), XFS_IOLOCK_SHARED|XFS_IOLOCK_EXCL));
> + ASSERT(xfs_isilocked(XFS_I(inode),
> + XFS_IOLOCK_SHARED | XFS_IOLOCK_EXCL));
>
> do {
> retry = false;
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 7c1ceb4df4ec..a3baec1c5bcf 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2781,7 +2781,7 @@ static void
> xfs_iunpin(
> struct xfs_inode *ip)
> {
> - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED));
> + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED));
>
> trace_xfs_inode_unpin_nowait(ip, _RET_IP_);
>
> @@ -3474,7 +3474,7 @@ xfs_iflush(
> struct xfs_mount *mp = ip->i_mount;
> int error;
>
> - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED));
> + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED));
> ASSERT(xfs_isiflocked(ip));
> ASSERT(ip->i_df.if_format != XFS_DINODE_FMT_BTREE ||
> ip->i_df.if_nextents > XFS_IFORK_MAXEXT(ip, XFS_DATA_FORK));
> diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> index be67570badf8..57bfa5266c47 100644
> --- a/fs/xfs/xfs_qm.c
> +++ b/fs/xfs/xfs_qm.c
> @@ -1803,7 +1803,7 @@ xfs_qm_vop_chown_reserve(
> int error;
>
>
> - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED));
> + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED));
> ASSERT(XFS_IS_QUOTA_RUNNING(mp));
>
> delblks = ip->i_delayed_blks;
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-10-12 16:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 19:55 [PATCH v11 0/4] xfs: Remove wrappers for some semaphores Pavel Reichl
2020-10-09 19:55 ` [PATCH v11 1/4] xfs: Refactor xfs_isilocked() Pavel Reichl
2020-10-12 16:03 ` Brian Foster
2020-10-12 21:28 ` Darrick J. Wong
2020-10-13 11:04 ` Brian Foster
2020-10-14 21:04 ` Pavel Reichl
2020-10-15 10:32 ` Brian Foster
2020-10-15 8:20 ` Christoph Hellwig
2020-10-09 19:55 ` [PATCH v11 2/4] xfs: clean up whitespace in xfs_isilocked() calls Pavel Reichl
2020-10-12 16:03 ` Brian Foster [this message]
2020-10-15 8:17 ` Christoph Hellwig
2020-10-09 19:55 ` [PATCH v11 3/4] xfs: xfs_isilocked() can only check a single lock type Pavel Reichl
2020-10-12 16:03 ` Brian Foster
2020-10-15 8:17 ` Christoph Hellwig
2020-10-09 19:55 ` [PATCH v11 4/4] xfs: replace mrlock_t with rw_semaphores Pavel Reichl
2020-10-12 16:04 ` Brian Foster
2020-10-12 20:44 ` Pavel Reichl
2020-10-13 11:04 ` Brian Foster
2020-10-13 13:39 ` Pavel Reichl
2020-10-13 13:49 ` Brian Foster
2020-10-12 21:02 ` Pavel Reichl
2020-10-12 21:30 ` Darrick J. Wong
2020-10-13 11:07 ` Brian Foster
2020-10-15 8:21 ` Christoph Hellwig
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=20201012160318.GI917726@bfoster \
--to=bfoster@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=preichl@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 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.