diff options
| author | Andrey Markovytch <andreym@codeaurora.org> | 2015-06-08 11:29:36 +0300 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:24:03 -0700 |
| commit | ecc052ba4efd2ee81fac2a35047bbd34a0344aca (patch) | |
| tree | 8bf695f7e58b2bf44d03e82600a2b7bf31cb49d5 /block | |
| parent | a56866b4eb9939e5e82d56eef4f172c069768712 (diff) | |
platform: msm: add Per-File-Tagger (PFT) driver
Integrated from msm-3.14. Additional fixes were made to compile with the
new kernel and various new warnings and checkpatch issues were fixed
Change-Id: I073db1041e41eac9066e37ee099f1da9e4eed6c0
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
[gbroner@codeaurora.org: fixed merge conflict and adapted the LSM
security hooks]
Signed-off-by: Gilad Broner <gbroner@codeaurora.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio.c | 1 | ||||
| -rw-r--r-- | block/blk-merge.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/block/bio.c b/block/bio.c index 4f184d938942..fd3159b2d4ac 100644 --- a/block/bio.c +++ b/block/bio.c @@ -584,6 +584,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src) bio->bi_rw = bio_src->bi_rw; bio->bi_iter = bio_src->bi_iter; bio->bi_io_vec = bio_src->bi_io_vec; + bio->bi_dio_inode = bio_src->bi_dio_inode; } EXPORT_SYMBOL(__bio_clone_fast); diff --git a/block/blk-merge.c b/block/blk-merge.c index b966db8f3556..5346f2d79652 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -6,6 +6,7 @@ #include <linux/bio.h> #include <linux/blkdev.h> #include <linux/scatterlist.h> +#include <linux/security.h> #include "blk.h" @@ -772,6 +773,11 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) !blk_write_same_mergeable(rq->bio, bio)) return false; + /* Don't merge bios of files with different encryption */ + if (!security_allow_merge_bio(rq->bio, bio)) + return false; + + return true; } |