diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-17 12:09:09 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-17 12:09:09 -0400 |
commit | 099ed4c2f5d54a5e1e490250805fb9727d622c0c (patch) | |
tree | 3c7e5ac0dd9dac409ed32d14b8863eefc0fa784a /drivers/ide | |
parent | 0a70c7f67a24b45e105ad10ac1d7e73fe50ec765 (diff) |
ide-disk: lock media before checking for media change
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 93ff15e6a9c4..2c48bd81f537 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
@@ -842,7 +842,6 @@ static int idedisk_open(struct inode *inode, struct file *filp) | |||
842 | idkp->openers++; | 842 | idkp->openers++; |
843 | 843 | ||
844 | if ((drive->dev_flags & IDE_DFLAG_REMOVABLE) && idkp->openers == 1) { | 844 | if ((drive->dev_flags & IDE_DFLAG_REMOVABLE) && idkp->openers == 1) { |
845 | check_disk_change(inode->i_bdev); | ||
846 | /* | 845 | /* |
847 | * Ignore the return code from door_lock, | 846 | * Ignore the return code from door_lock, |
848 | * since the open() has already succeeded, | 847 | * since the open() has already succeeded, |
@@ -851,6 +850,7 @@ static int idedisk_open(struct inode *inode, struct file *filp) | |||
851 | if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) && | 850 | if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) && |
852 | idedisk_set_doorlock(drive, 1)) | 851 | idedisk_set_doorlock(drive, 1)) |
853 | drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING; | 852 | drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING; |
853 | check_disk_change(inode->i_bdev); | ||
854 | } | 854 | } |
855 | return 0; | 855 | return 0; |
856 | } | 856 | } |