From: Julia Lawall <Julia.Lawall@lip6.fr>
To: Mark Fasheh <mfasheh@suse.com>
Cc: sergey.senozhatsky@gmail.com, kernel-janitors@vger.kernel.org,
Joel Becker <jlbec@evilplan.org>,
ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org
Subject: [PATCH 27/39] ocfs2: drop null test before destroy functions
Date: Sun, 13 Sep 2015 14:15:20 +0200 [thread overview]
Message-ID: <1442146532-9100-28-git-send-email-Julia.Lawall@lip6.fr> (raw)
In-Reply-To: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr>
Remove unneeded NULL test.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x;
@@
-if (x != NULL)
\(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
@@
expression x;
@@
-if (x != NULL) {
\(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
x = NULL;
-}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
fs/ocfs2/dlm/dlmlock.c | 3 +--
fs/ocfs2/dlm/dlmmaster.c | 16 +++++-----------
fs/ocfs2/super.c | 18 ++++++------------
fs/ocfs2/uptodate.c | 3 +--
4 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/fs/ocfs2/uptodate.c b/fs/ocfs2/uptodate.c
index 82e17b0..78f09c7 100644
--- a/fs/ocfs2/uptodate.c
+++ b/fs/ocfs2/uptodate.c
@@ -633,6 +633,5 @@ int __init init_ocfs2_uptodate_cache(void)
void exit_ocfs2_uptodate_cache(void)
{
- if (ocfs2_uptodate_cachep)
- kmem_cache_destroy(ocfs2_uptodate_cachep);
+ kmem_cache_destroy(ocfs2_uptodate_cachep);
}
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 46b8b2b..eb53b98 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -414,8 +414,7 @@ int dlm_init_mle_cache(void)
void dlm_destroy_mle_cache(void)
{
- if (dlm_mle_cache)
- kmem_cache_destroy(dlm_mle_cache);
+ kmem_cache_destroy(dlm_mle_cache);
}
static void dlm_mle_release(struct kref *kref)
@@ -472,15 +471,10 @@ bail:
void dlm_destroy_master_caches(void)
{
- if (dlm_lockname_cache) {
- kmem_cache_destroy(dlm_lockname_cache);
- dlm_lockname_cache = NULL;
- }
-
- if (dlm_lockres_cache) {
- kmem_cache_destroy(dlm_lockres_cache);
- dlm_lockres_cache = NULL;
- }
+ kmem_cache_destroy(dlm_lockname_cache);
+ dlm_lockname_cache = NULL;
+ kmem_cache_destroy(dlm_lockres_cache);
+ dlm_lockres_cache = NULL;
}
static void dlm_lockres_release(struct kref *kref)
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c
index 66c2a49..7496231 100644
--- a/fs/ocfs2/dlm/dlmlock.c
+++ b/fs/ocfs2/dlm/dlmlock.c
@@ -77,8 +77,7 @@ int dlm_init_lock_cache(void)
void dlm_destroy_lock_cache(void)
{
- if (dlm_lock_cache)
- kmem_cache_destroy(dlm_lock_cache);
+ kmem_cache_destroy(dlm_lock_cache);
}
/* Tell us whether we can grant a new lock request.
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 2de4c8a..88396d2 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1786,12 +1786,9 @@ static int ocfs2_initialize_mem_caches(void)
NULL);
if (!ocfs2_inode_cachep || !ocfs2_dquot_cachep ||
!ocfs2_qf_chunk_cachep) {
- if (ocfs2_inode_cachep)
- kmem_cache_destroy(ocfs2_inode_cachep);
- if (ocfs2_dquot_cachep)
- kmem_cache_destroy(ocfs2_dquot_cachep);
- if (ocfs2_qf_chunk_cachep)
- kmem_cache_destroy(ocfs2_qf_chunk_cachep);
+ kmem_cache_destroy(ocfs2_inode_cachep);
+ kmem_cache_destroy(ocfs2_dquot_cachep);
+ kmem_cache_destroy(ocfs2_qf_chunk_cachep);
return -ENOMEM;
}
@@ -1805,16 +1802,13 @@ static void ocfs2_free_mem_caches(void)
* destroy cache.
*/
rcu_barrier();
- if (ocfs2_inode_cachep)
- kmem_cache_destroy(ocfs2_inode_cachep);
+ kmem_cache_destroy(ocfs2_inode_cachep);
ocfs2_inode_cachep = NULL;
- if (ocfs2_dquot_cachep)
- kmem_cache_destroy(ocfs2_dquot_cachep);
+ kmem_cache_destroy(ocfs2_dquot_cachep);
ocfs2_dquot_cachep = NULL;
- if (ocfs2_qf_chunk_cachep)
- kmem_cache_destroy(ocfs2_qf_chunk_cachep);
+ kmem_cache_destroy(ocfs2_qf_chunk_cachep);
ocfs2_qf_chunk_cachep = NULL;
}
WARNING: multiple messages have this Message-ID (diff)
From: Julia Lawall <Julia.Lawall@lip6.fr>
To: Mark Fasheh <mfasheh@suse.com>
Cc: sergey.senozhatsky@gmail.com, kernel-janitors@vger.kernel.org,
Joel Becker <jlbec@evilplan.org>,
ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org
Subject: [PATCH 27/39] ocfs2: drop null test before destroy functions
Date: Sun, 13 Sep 2015 12:15:20 +0000 [thread overview]
Message-ID: <1442146532-9100-28-git-send-email-Julia.Lawall@lip6.fr> (raw)
In-Reply-To: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr>
Remove unneeded NULL test.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x;
@@
-if (x != NULL)
\(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
@@
expression x;
@@
-if (x != NULL) {
\(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
x = NULL;
-}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
fs/ocfs2/dlm/dlmlock.c | 3 +--
fs/ocfs2/dlm/dlmmaster.c | 16 +++++-----------
fs/ocfs2/super.c | 18 ++++++------------
fs/ocfs2/uptodate.c | 3 +--
4 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/fs/ocfs2/uptodate.c b/fs/ocfs2/uptodate.c
index 82e17b0..78f09c7 100644
--- a/fs/ocfs2/uptodate.c
+++ b/fs/ocfs2/uptodate.c
@@ -633,6 +633,5 @@ int __init init_ocfs2_uptodate_cache(void)
void exit_ocfs2_uptodate_cache(void)
{
- if (ocfs2_uptodate_cachep)
- kmem_cache_destroy(ocfs2_uptodate_cachep);
+ kmem_cache_destroy(ocfs2_uptodate_cachep);
}
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 46b8b2b..eb53b98 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -414,8 +414,7 @@ int dlm_init_mle_cache(void)
void dlm_destroy_mle_cache(void)
{
- if (dlm_mle_cache)
- kmem_cache_destroy(dlm_mle_cache);
+ kmem_cache_destroy(dlm_mle_cache);
}
static void dlm_mle_release(struct kref *kref)
@@ -472,15 +471,10 @@ bail:
void dlm_destroy_master_caches(void)
{
- if (dlm_lockname_cache) {
- kmem_cache_destroy(dlm_lockname_cache);
- dlm_lockname_cache = NULL;
- }
-
- if (dlm_lockres_cache) {
- kmem_cache_destroy(dlm_lockres_cache);
- dlm_lockres_cache = NULL;
- }
+ kmem_cache_destroy(dlm_lockname_cache);
+ dlm_lockname_cache = NULL;
+ kmem_cache_destroy(dlm_lockres_cache);
+ dlm_lockres_cache = NULL;
}
static void dlm_lockres_release(struct kref *kref)
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c
index 66c2a49..7496231 100644
--- a/fs/ocfs2/dlm/dlmlock.c
+++ b/fs/ocfs2/dlm/dlmlock.c
@@ -77,8 +77,7 @@ int dlm_init_lock_cache(void)
void dlm_destroy_lock_cache(void)
{
- if (dlm_lock_cache)
- kmem_cache_destroy(dlm_lock_cache);
+ kmem_cache_destroy(dlm_lock_cache);
}
/* Tell us whether we can grant a new lock request.
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 2de4c8a..88396d2 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1786,12 +1786,9 @@ static int ocfs2_initialize_mem_caches(void)
NULL);
if (!ocfs2_inode_cachep || !ocfs2_dquot_cachep ||
!ocfs2_qf_chunk_cachep) {
- if (ocfs2_inode_cachep)
- kmem_cache_destroy(ocfs2_inode_cachep);
- if (ocfs2_dquot_cachep)
- kmem_cache_destroy(ocfs2_dquot_cachep);
- if (ocfs2_qf_chunk_cachep)
- kmem_cache_destroy(ocfs2_qf_chunk_cachep);
+ kmem_cache_destroy(ocfs2_inode_cachep);
+ kmem_cache_destroy(ocfs2_dquot_cachep);
+ kmem_cache_destroy(ocfs2_qf_chunk_cachep);
return -ENOMEM;
}
@@ -1805,16 +1802,13 @@ static void ocfs2_free_mem_caches(void)
* destroy cache.
*/
rcu_barrier();
- if (ocfs2_inode_cachep)
- kmem_cache_destroy(ocfs2_inode_cachep);
+ kmem_cache_destroy(ocfs2_inode_cachep);
ocfs2_inode_cachep = NULL;
- if (ocfs2_dquot_cachep)
- kmem_cache_destroy(ocfs2_dquot_cachep);
+ kmem_cache_destroy(ocfs2_dquot_cachep);
ocfs2_dquot_cachep = NULL;
- if (ocfs2_qf_chunk_cachep)
- kmem_cache_destroy(ocfs2_qf_chunk_cachep);
+ kmem_cache_destroy(ocfs2_qf_chunk_cachep);
ocfs2_qf_chunk_cachep = NULL;
}
next prev parent reply other threads:[~2015-09-13 12:31 UTC|newest]
Thread overview: 163+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-13 12:14 [PATCH 00/39] drop null test before destroy functions Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-13 12:14 ` [Cluster-devel] " Julia Lawall
2015-09-13 12:14 ` [Intel-wired-lan] " Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-13 12:14 ` [PATCH 01/39] mtd: nandsim: " Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-22 0:07 ` Brian Norris
2015-09-22 0:07 ` Brian Norris
2015-09-13 12:14 ` [PATCH 02/39] nilfs2: " Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-14 3:29 ` Ryusuke Konishi
2015-09-14 3:29 ` Ryusuke Konishi
2015-09-14 3:29 ` Ryusuke Konishi
2015-09-13 12:14 ` [PATCH 03/39] firmware: google: " Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-13 12:14 ` [PATCH 04/39] debugobjects: " Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-13 12:14 ` [PATCH 05/39] xhci: " Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-13 12:14 ` [PATCH 06/39] Btrfs: " Julia Lawall
2015-09-13 12:14 ` Julia Lawall
2015-09-14 20:43 ` David Sterba
2015-09-14 20:43 ` David Sterba
2015-09-13 12:15 ` [PATCH 07/39] fs: ext4: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 08/39] pktcdvd: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-29 13:02 ` Jiri Kosina
2015-09-29 13:02 ` Jiri Kosina
2015-09-13 12:15 ` [PATCH 09/39] aoe: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-15 1:39 ` Ed Cashin
2015-09-15 1:39 ` Ed Cashin
2015-09-13 12:15 ` [PATCH 10/39] atm: he: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-15 23:50 ` David Miller
2015-09-15 23:50 ` David Miller
2015-09-13 12:15 ` [PATCH 11/39] hfi1: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-15 13:56 ` Marciniszyn, Mike
2015-09-15 13:56 ` Marciniszyn, Mike
2015-09-13 12:15 ` [PATCH 12/39] dm: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-14 13:46 ` [dm-devel] " Mikulas Patocka
2015-09-14 13:46 ` Mikulas Patocka
2015-09-14 14:00 ` Mike Snitzer
2015-09-14 14:00 ` Mike Snitzer
2015-09-14 14:05 ` Mikulas Patocka
2015-09-14 14:05 ` Mikulas Patocka
2015-09-14 18:50 ` Julia Lawall
2015-09-14 18:50 ` Julia Lawall
2015-09-14 14:23 ` [dm-devel] " walter harms
2015-09-14 14:23 ` walter harms
2015-09-13 12:15 ` [PATCH 13/39] staging: lustre: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 14/39] SUNRPC: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-14 16:07 ` J. Bruce Fields
2015-09-14 16:07 ` J. Bruce Fields
2015-09-14 16:07 ` J. Bruce Fields
2015-09-14 16:25 ` Trond Myklebust
2015-09-14 16:25 ` Trond Myklebust
2015-09-13 12:15 ` [PATCH 15/39] bcache: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-14 9:08 ` Johannes Thumshirn
2015-09-14 9:08 ` Johannes Thumshirn
2015-09-13 12:15 ` [PATCH 16/39] usb: gadget: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 17/39] md: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-15 7:29 ` Neil Brown
2015-09-15 7:29 ` Neil Brown
2015-09-13 12:15 ` [PATCH 18/39] whci: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 19/39] jbd2: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 20/39] ixgbe: " Julia Lawall
2015-09-13 12:15 ` [Intel-wired-lan] " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 21/39] drbd: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 22/39] nfsd: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-14 16:06 ` J. Bruce Fields
2015-09-14 16:06 ` J. Bruce Fields
2015-09-13 12:15 ` [PATCH 23/39] UBI: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-10-03 18:36 ` Richard Weinberger
2015-10-03 18:36 ` Richard Weinberger
2015-09-13 12:15 ` [PATCH 24/39] dlm: " Julia Lawall
2015-09-13 12:15 ` [Cluster-devel] " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 25/39] net: core: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-15 23:50 ` David Miller
2015-09-15 23:50 ` David Miller
2015-09-13 12:15 ` [PATCH 26/39] dmaengine: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-21 17:10 ` Vinod Koul
2015-09-21 17:22 ` Vinod Koul
2015-09-13 12:15 ` Julia Lawall [this message]
2015-09-13 12:15 ` [PATCH 27/39] ocfs2: " Julia Lawall
2015-09-13 12:15 ` [PATCH 28/39] ecryptfs: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-15 2:08 ` Tyler Hicks
2015-09-15 2:08 ` Tyler Hicks
2015-09-15 4:36 ` Julia Lawall
2015-09-15 4:36 ` Julia Lawall
2015-09-15 14:45 ` Tyler Hicks
2015-09-15 14:45 ` Tyler Hicks
2015-09-13 12:15 ` [PATCH 29/39] thunderbolt: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 30/39] block: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 31/39] KVM: MMU: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-14 8:30 ` Paolo Bonzini
2015-09-14 8:30 ` Paolo Bonzini
2015-09-13 12:15 ` [PATCH 32/39] drm: i915: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-30 8:44 ` [Intel-gfx] " Daniel Vetter
2015-09-30 8:44 ` Daniel Vetter
2015-09-30 8:44 ` Daniel Vetter
2015-09-13 12:15 ` [PATCH 33/39] rbd: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-14 9:53 ` Ilya Dryomov
2015-09-14 9:53 ` Ilya Dryomov
2015-09-13 12:15 ` [PATCH 34/39] dccp: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-15 23:50 ` David Miller
2015-09-15 23:50 ` David Miller
2015-09-15 23:50 ` David Miller
2015-09-13 12:15 ` [PATCH 35/39] GFS2: " Julia Lawall
2015-09-13 12:15 ` [Cluster-devel] " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 36/39] jffs2: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` [PATCH 37/39] f2fs crypto: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-16 10:17 ` Chao Yu
2015-09-16 10:17 ` Chao Yu
2015-09-16 10:17 ` Chao Yu
2015-09-13 12:15 ` [PATCH 38/39] iommu/amd: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-29 13:41 ` Joerg Roedel
2015-09-29 13:41 ` Joerg Roedel
2015-09-13 12:15 ` [PATCH 39/39] usb: host: " Julia Lawall
2015-09-13 12:15 ` Julia Lawall
2015-09-14 11:55 ` [PATCH 00/39] " SF Markus Elfring
2015-09-14 11:55 ` SF Markus Elfring
2015-09-14 11:55 ` [Cluster-devel] " SF Markus Elfring
2015-09-14 11:55 ` [Intel-wired-lan] " SF Markus Elfring
2015-09-14 11:55 ` SF Markus Elfring
2015-09-14 11:55 ` SF Markus Elfring
2015-09-14 11:55 ` SF Markus Elfring
2015-09-14 11:55 ` SF Markus Elfring
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=1442146532-9100-28-git-send-email-Julia.Lawall@lip6.fr \
--to=julia.lawall@lip6.fr \
--cc=jlbec@evilplan.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mfasheh@suse.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=sergey.senozhatsky@gmail.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.