diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
| commit | 4fcea1cf4c9da385a2fa90dc631ff453bbfdbcb1 (patch) | |
| tree | db2b279c1ef40e8170883efd1c0bd118d1803aec /drivers/md/md.c | |
| parent | b153532021104be5cc1abc3b6b60c004739b31c7 (diff) | |
| parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) | |
Merge tag 'v3.10.19' into linux-lnglinux-lng-v3.10.19-final
This is the 3.10.19 stable release
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 51f0345a4ba4..d78f1fffab01 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -8072,6 +8072,7 @@ static int md_set_badblocks(struct badblocks *bb, sector_t s, int sectors, u64 *p; int lo, hi; int rv = 1; + unsigned long flags; if (bb->shift < 0) /* badblocks are disabled */ @@ -8086,7 +8087,7 @@ static int md_set_badblocks(struct badblocks *bb, sector_t s, int sectors, sectors = next - s; } - write_seqlock_irq(&bb->lock); + write_seqlock_irqsave(&bb->lock, flags); p = bb->page; lo = 0; @@ -8202,7 +8203,7 @@ static int md_set_badblocks(struct badblocks *bb, sector_t s, int sectors, bb->changed = 1; if (!acknowledged) bb->unacked_exist = 1; - write_sequnlock_irq(&bb->lock); + write_sequnlock_irqrestore(&bb->lock, flags); return rv; } |