From cbc86d6b061f11aa10ca37328e769482bb29ea99 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Fri, 21 Dec 2012 20:23:33 +0000 Subject: [PATCH] --- yaml --- r: 347950 b: refs/heads/master c: 9aa0c0e60ffc2594acaad23127dbea9f3b61821c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-snap.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 81c75d8e72a1..a3088bedf069 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19cbbc60c680e2e404bf55458ad2c4ff60d16076 +refs/heads/master: 9aa0c0e60ffc2594acaad23127dbea9f3b61821c diff --git a/trunk/drivers/md/dm-snap.c b/trunk/drivers/md/dm-snap.c index a143921feaf6..223e7ebf24f7 100644 --- a/trunk/drivers/md/dm-snap.c +++ b/trunk/drivers/md/dm-snap.c @@ -198,14 +198,13 @@ static struct dm_snap_tracked_chunk *track_chunk(struct dm_snapshot *s, { struct dm_snap_tracked_chunk *c = mempool_alloc(s->tracked_chunk_pool, GFP_NOIO); - unsigned long flags; c->chunk = chunk; - spin_lock_irqsave(&s->tracked_chunk_lock, flags); + spin_lock_irq(&s->tracked_chunk_lock); hlist_add_head(&c->node, &s->tracked_chunk_hash[DM_TRACKED_CHUNK_HASH(chunk)]); - spin_unlock_irqrestore(&s->tracked_chunk_lock, flags); + spin_unlock_irq(&s->tracked_chunk_lock); return c; }