> -----Original Message----- > From: Intel-wired-lan <[email protected]> On Behalf > Of Philipp Hahn > Sent: Tuesday, March 10, 2026 12:49 PM > To: [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; dm- > [email protected]; [email protected]; > [email protected]; [email protected]; intel-wired- > [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; linux-security- > [email protected]; [email protected]; linux- > [email protected]; [email protected]; > [email protected]; [email protected]; linux- > [email protected]; [email protected]; > [email protected]; [email protected]; sched- > [email protected]; [email protected]; tipc- > [email protected]; [email protected]; Philipp Hahn > <[email protected]> > Cc: Alasdair Kergon <[email protected]>; Mike Snitzer > <[email protected]>; Mikulas Patocka <[email protected]>; Benjamin > Marzinski <[email protected]> > Subject: [Intel-wired-lan] [PATCH 22/61] md: Prefer IS_ERR_OR_NULL > over manual NULL check > > Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL > check. > > Change generated with coccinelle. > > To: Alasdair Kergon <[email protected]> > To: Mike Snitzer <[email protected]> > To: Mikulas Patocka <[email protected]> > To: Benjamin Marzinski <[email protected]> > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Philipp Hahn <[email protected]> > --- > drivers/md/dm-cache-metadata.c | 2 +- > drivers/md/dm-crypt.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache- > metadata.c index > 57158c02d096ed38759d563bf27e7f1b3fe58ccc..32f7d25b83a181a30a78c663d48f > 7882cb97f7b5 100644 > --- a/drivers/md/dm-cache-metadata.c > +++ b/drivers/md/dm-cache-metadata.c > @@ -1819,7 +1819,7 @@ int dm_cache_metadata_abort(struct > dm_cache_metadata *cmd) > WRITE_UNLOCK(cmd); > dm_block_manager_destroy(old_bm); > out: > - if (new_bm && !IS_ERR(new_bm)) > + if (!IS_ERR_OR_NULL(new_bm)) > dm_block_manager_destroy(new_bm); > > return r; > diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index > 54823341c9fda46b2d8e13428cbd51f3edf642d5..05eae3d3c7df6baebd0b7a4219f7 > b6938f6e7f87 100644 > --- a/drivers/md/dm-crypt.c > +++ b/drivers/md/dm-crypt.c > @@ -2295,7 +2295,7 @@ static void crypt_free_tfms_aead(struct > crypt_config *cc) > if (!cc->cipher_tfm.tfms_aead) > return; > > - if (cc->cipher_tfm.tfms_aead[0] && !IS_ERR(cc- > >cipher_tfm.tfms_aead[0])) { > + if (!IS_ERR_OR_NULL(cc->cipher_tfm.tfms_aead[0])) { > crypto_free_aead(cc->cipher_tfm.tfms_aead[0]); > cc->cipher_tfm.tfms_aead[0] = NULL; > } > @@ -2312,7 +2312,7 @@ static void crypt_free_tfms_skcipher(struct > crypt_config *cc) > return; > > for (i = 0; i < cc->tfms_count; i++) > - if (cc->cipher_tfm.tfms[i] && !IS_ERR(cc- > >cipher_tfm.tfms[i])) { > + if (!IS_ERR_OR_NULL(cc->cipher_tfm.tfms[i])) { > crypto_free_skcipher(cc->cipher_tfm.tfms[i]); > cc->cipher_tfm.tfms[i] = NULL; > } > > -- > 2.43.0
Reviewed-by: Aleksandr Loktionov <[email protected]>
