Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26292
b: refs/heads/master
c: 39ccf95
h: refs/heads/master
v: v3
  • Loading branch information
Horst Hummel authored and Linus Torvalds committed Apr 28, 2006
1 parent 8bbde88 commit 1f3b5fd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a3ae39c060be57a4936d2c1d970e4d0c7d320d9c
refs/heads/master: 39ccf95e28765a08a9e01be614695d7c570b4e77
5 changes: 5 additions & 0 deletions trunk/drivers/s390/block/dasd.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,11 @@ dasd_increase_state(struct dasd_device *device)
device->target >= DASD_STATE_READY)
rc = dasd_state_basic_to_ready(device);

if (!rc &&
device->state == DASD_STATE_UNFMT &&
device->target > DASD_STATE_UNFMT)
rc = -EPERM;

if (!rc &&
device->state == DASD_STATE_READY &&
device->target >= DASD_STATE_ONLINE)
Expand Down

0 comments on commit 1f3b5fd

Please sign in to comment.