From: Nikolay Borisov <nborisov@suse.com>
To: Al Viro <viro@ZenIV.linux.org.uk>, linux-fsdevel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Miklos Szeredi <mszeredi@redhat.com>, Chris Mason <clm@fb.com>,
David Sterba <dsterba@suse.cz>,
linux-btrfs <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH 09/16] btrfs: IS_ERR(p) && PTR_ERR(p) == n is a weird way to spell p == ERR_PTR(n)
Date: Mon, 30 Jul 2018 11:06:42 +0300 [thread overview]
Message-ID: <a15c7158-bc61-e2f2-0904-2cb637238b04@suse.com> (raw)
In-Reply-To: <20180729220453.13431-9-viro@ZenIV.linux.org.uk>
[ADDED David Sterba and Linux-btrfs mailing list]
On 30.07.2018 01:04, Al Viro wrote:
> From: Al Viro <viro@zeniv.linux.org.uk>
>
> Cc: Chris Mason <clm@fb.com>
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
David, yout might want to pull this immediately, it's a nice cleanup.
> ---
> fs/btrfs/transaction.c | 2 +-
> fs/btrfs/tree-log.c | 5 ++---
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
> index ff5f6c719976..feb0348dbcbf 100644
> --- a/fs/btrfs/transaction.c
> +++ b/fs/btrfs/transaction.c
> @@ -680,7 +680,7 @@ btrfs_attach_transaction_barrier(struct btrfs_root *root)
>
> trans = start_transaction(root, 0, TRANS_ATTACH,
> BTRFS_RESERVE_NO_FLUSH, true);
> - if (IS_ERR(trans) && PTR_ERR(trans) == -ENOENT)
> + if (trans == ERR_PTR(-ENOENT))
> btrfs_wait_for_commit(root->fs_info, 0);
>
> return trans;
> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
> index fcfbe1d8584a..2c13e8155ff1 100644
> --- a/fs/btrfs/tree-log.c
> +++ b/fs/btrfs/tree-log.c
> @@ -2116,7 +2116,7 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans,
> dir_key->offset,
> name, name_len, 0);
> }
> - if (!log_di || (IS_ERR(log_di) && PTR_ERR(log_di) == -ENOENT)) {
> + if (!log_di || log_di == ERR_PTR(-ENOENT)) {
> btrfs_dir_item_key_to_cpu(eb, di, &location);
> btrfs_release_path(path);
> btrfs_release_path(log_path);
> @@ -5090,8 +5090,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
> * we don't need to do more work nor fallback to
> * a transaction commit.
> */
> - if (IS_ERR(other_inode) &&
> - PTR_ERR(other_inode) == -ENOENT) {
> + if (other_inode == ERR_PTR(-ENOENT)) {
> goto next_key;
> } else if (IS_ERR(other_inode)) {
> err = PTR_ERR(other_inode);
>
next prev parent reply other threads:[~2018-07-30 9:40 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-29 22:03 [PATCHES][RFC] icache-related stuff Al Viro
2018-07-29 22:04 ` [PATCH 01/16] nfs_instantiate(): prevent multiple aliases for directory inode Al Viro
2018-07-29 22:04 ` [PATCH 02/16] new primitive: discard_new_inode() Al Viro
2018-07-29 22:04 ` [PATCH 03/16] vfs: don't evict uninitialized inode Al Viro
2018-07-30 5:09 ` Amir Goldstein
2018-07-30 7:41 ` Miklos Szeredi
2018-08-16 16:29 ` Amir Goldstein
2018-08-24 6:47 ` Amir Goldstein
2018-10-08 6:41 ` Miklos Szeredi
2018-10-08 13:23 ` Greg KH
2018-07-29 22:04 ` [PATCH 04/16] btrfs: switch to discard_new_inode() Al Viro
2018-08-01 15:25 ` David Sterba
2018-07-29 22:04 ` [PATCH 05/16] ufs: " Al Viro
2018-07-29 22:04 ` [PATCH 06/16] udf: " Al Viro
2018-07-29 22:04 ` [PATCH 07/16] ext2: make sure that partially set up inodes won't be returned by ext2_iget() Al Viro
2018-07-29 22:04 ` [PATCH 08/16] btrfs: btrfs_iget() never returns an is_bad_inode() inode Al Viro
2018-07-30 8:13 ` Nikolay Borisov
2018-07-29 22:04 ` [PATCH 09/16] btrfs: IS_ERR(p) && PTR_ERR(p) == n is a weird way to spell p == ERR_PTR(n) Al Viro
2018-07-30 8:06 ` Nikolay Borisov [this message]
2018-07-29 22:04 ` [PATCH 10/16] kill d_instantiate_no_diralias() Al Viro
2018-07-29 22:04 ` [PATCH 11/16] jfs: switch to discard_new_inode() Al Viro
2018-07-29 22:04 ` [PATCH 12/16] new helper: inode_fake_hash() Al Viro
2018-07-29 22:04 ` [PATCH 13/16] btrfs: lift make_bad_inode() into btrfs_iget() Al Viro
2018-07-30 8:15 ` Nikolay Borisov
2018-07-29 22:04 ` [PATCH 14/16] btrfs: simplify btrfs_iget() Al Viro
2018-07-30 8:17 ` Nikolay Borisov
2018-07-29 22:04 ` [PATCH 15/16] adfs: don't put inodes into icache Al Viro
2018-07-29 22:04 ` [PATCH 16/16] jfs: don't bother with make_bad_inode() in ialloc() Al Viro
2018-07-30 21:35 ` [PATCHES][RFC] icache-related stuff Linus Torvalds
2018-08-01 15:25 ` David Sterba
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=a15c7158-bc61-e2f2-0904-2cb637238b04@suse.com \
--to=nborisov@suse.com \
--cc=clm@fb.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mszeredi@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/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).