← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/block_dev.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Upstream Kernel Changes
  • Date: 2012-03-27 17:01:30 UTC
  • Revision ID: package-import@ubuntu.com-20120327170130-qrvi60snnxty6ibi
Tags: 3.2.0-1411.14
https://launchpad.net/bugs/963512
[ Paolo Pisati ]

* Revert to Ubuntu-3.2.0-1409.12 until we figure out what's wrong with hdmi
  - LP: #963512

[ Upstream Kernel Changes ]

* Revert "Reapply upleveled PMU interrupt patch"
* KBuild: Allow scripts/* to be cross compiled
* LINARO: Use KBUILD_SCRIPTROOT to cross build scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/block_dev.c
1159
1159
                         * The latter is necessary to prevent ghost
1160
1160
                         * partitions on a removed medium.
1161
1161
                         */
1162
 
                        if (bdev->bd_invalidated) {
1163
 
                                if (!ret)
1164
 
                                        rescan_partitions(disk, bdev);
1165
 
                                else if (ret == -ENOMEDIUM)
1166
 
                                        invalidate_partitions(disk, bdev);
1167
 
                        }
 
1162
                        if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM))
 
1163
                                rescan_partitions(disk, bdev);
1168
1164
                        if (ret)
1169
1165
                                goto out_clear;
1170
1166
                } else {
1194
1190
                        if (bdev->bd_disk->fops->open)
1195
1191
                                ret = bdev->bd_disk->fops->open(bdev, mode);
1196
1192
                        /* the same as first opener case, read comment there */
1197
 
                        if (bdev->bd_invalidated) {
1198
 
                                if (!ret)
1199
 
                                        rescan_partitions(bdev->bd_disk, bdev);
1200
 
                                else if (ret == -ENOMEDIUM)
1201
 
                                        invalidate_partitions(bdev->bd_disk, bdev);
1202
 
                        }
 
1193
                        if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM))
 
1194
                                rescan_partitions(bdev->bd_disk, bdev);
1203
1195
                        if (ret)
1204
1196
                                goto out_unlock_bdev;
1205
1197
                }