cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Bob Peterson <rpeterso@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 5/5] GFS2: Protect freeing directory hash table with i_lock spin_lock
Date: Thu,  5 Nov 2015 11:26:48 -0600	[thread overview]
Message-ID: <1446744408-21047-6-git-send-email-rpeterso@redhat.com> (raw)
In-Reply-To: <1446744408-21047-1-git-send-email-rpeterso@redhat.com>

This patch changes function gfs2_dir_hash_inval so it uses the
i_lock spin_lock to protect the in-core hash table, i_hash_cache.
This will prevent double-frees due to a race between gfs2_evict_inode
and inode invalidation.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
---
 fs/gfs2/dir.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 487527b..ad8a5b7 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -388,8 +388,13 @@ static __be64 *gfs2_dir_get_hash_table(struct gfs2_inode *ip)
  */
 void gfs2_dir_hash_inval(struct gfs2_inode *ip)
 {
-	__be64 *hc = ip->i_hash_cache;
+	__be64 *hc;
+
+	spin_lock(&ip->i_inode.i_lock);
+	hc = ip->i_hash_cache;
 	ip->i_hash_cache = NULL;
+	spin_unlock(&ip->i_inode.i_lock);
+
 	kvfree(hc);
 }
 
-- 
2.4.3



      parent reply	other threads:[~2015-11-05 17:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-05 17:26 [Cluster-devel] [PATCH 0/5] GFS2: Pre-pull patch posting (merge window) Bob Peterson
2015-11-05 17:26 ` [Cluster-devel] [PATCH 1/5] GFS2: fallocate: do not rely on file_update_time to mark the inode dirty Bob Peterson
2015-11-05 17:26 ` [Cluster-devel] [PATCH 2/5] GFS2: Set s_mode before parsing mount options Bob Peterson
2015-11-05 17:26 ` [Cluster-devel] [PATCH 3/5] gfs2: Add missing else in trans_add_meta/data Bob Peterson
2015-11-05 17:26 ` [Cluster-devel] [PATCH 4/5] gfs2: Remove gl_spin define Bob Peterson
2015-11-05 17:26 ` Bob Peterson [this message]

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=1446744408-21047-6-git-send-email-rpeterso@redhat.com \
    --to=rpeterso@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 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).