projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk-core.c
diff --git
a/block/blk-core.c
b/block/blk-core.c
index f0834e2f57275d8903f65b655645f66a9b2016ee..4ce953f1b3909f38f213adcc0a39251a34875330 100644
(file)
--- a/
block/blk-core.c
+++ b/
block/blk-core.c
@@
-1194,13
+1194,6
@@
static int __make_request(struct request_queue *q, struct bio *bio)
int where = ELEVATOR_INSERT_SORT;
int rw_flags;
int where = ELEVATOR_INSERT_SORT;
int rw_flags;
- /* REQ_HARDBARRIER is no more */
- if (WARN_ONCE(bio->bi_rw & REQ_HARDBARRIER,
- "block: HARDBARRIER is deprecated, use FLUSH/FUA instead\n")) {
- bio_endio(bio, -EOPNOTSUPP);
- return 0;
- }
-
/*
* low level driver can indicate that it wants pages above a
* certain limit bounced to low memory (ie for highmem, or even
/*
* low level driver can indicate that it wants pages above a
* certain limit bounced to low memory (ie for highmem, or even
@@
-1351,7
+1344,7
@@
static void handle_bad_sector(struct bio *bio)
bdevname(bio->bi_bdev, b),
bio->bi_rw,
(unsigned long long)bio->bi_sector + bio_sectors(bio),
bdevname(bio->bi_bdev, b),
bio->bi_rw,
(unsigned long long)bio->bi_sector + bio_sectors(bio),
- (long long)(
bio->bi_bdev->bd_inode->i_size
>> 9));
+ (long long)(
i_size_read(bio->bi_bdev->bd_inode)
>> 9));
set_bit(BIO_EOF, &bio->bi_flags);
}
set_bit(BIO_EOF, &bio->bi_flags);
}
@@
-1404,7
+1397,7
@@
static inline int bio_check_eod(struct bio *bio, unsigned int nr_sectors)
return 0;
/* Test device or partition size, when known. */
return 0;
/* Test device or partition size, when known. */
- maxsector =
bio->bi_bdev->bd_inode->i_size
>> 9;
+ maxsector =
i_size_read(bio->bi_bdev->bd_inode)
>> 9;
if (maxsector) {
sector_t sector = bio->bi_sector;
if (maxsector) {
sector_t sector = bio->bi_sector;