Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 84570
b: refs/heads/master
c: 94d6351
h: refs/heads/master
v: v3
  • Loading branch information
Milan Broz authored and Alasdair G Kergon committed Feb 8, 2008
1 parent fc06461 commit 557a02e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 73d410c0137f63c6597e9763c81e5f4d015e9940
refs/heads/master: 94d6351e147231b2c5a9512d69693ee8ac0c204d
3 changes: 2 additions & 1 deletion trunk/drivers/md/dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1434,17 +1434,18 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)

if (noflush)
__merge_pushback_list(md);
up_write(&md->io_lock);

/* were we interrupted ? */
if (pending) {
down_write(&md->io_lock);
__flush_deferred_io(md);
up_write(&md->io_lock);

unlock_fs(md);
r = -EINTR;
goto out; /* pushback list is already flushed, so skip flush */
}
up_write(&md->io_lock);

dm_table_postsuspend_targets(map);

Expand Down

0 comments on commit 557a02e

Please sign in to comment.