projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'devicetree-fixes-for-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
drivers
/
block
/
loop.c
diff --git
a/drivers/block/loop.c
b/drivers/block/loop.c
index abad6d15f956343ff86ad45d0f40ff4c7faae50b..cb0cc868507620513d3de7658ed1f6999ceaa965 100644
(file)
--- a/
drivers/block/loop.c
+++ b/
drivers/block/loop.c
@@
-77,7
+77,6
@@
#include <linux/falloc.h>
#include <linux/uio.h>
#include <linux/ioprio.h>
#include <linux/falloc.h>
#include <linux/uio.h>
#include <linux/ioprio.h>
-#include <linux/blk-cgroup.h>
#include "loop.h"
#include "loop.h"
@@
-269,7
+268,7
@@
static int lo_write_bvec(struct file *file, struct bio_vec *bvec, loff_t *ppos)
struct iov_iter i;
ssize_t bw;
struct iov_iter i;
ssize_t bw;
- iov_iter_bvec(&i,
ITER_BVEC |
WRITE, bvec, 1, bvec->bv_len);
+ iov_iter_bvec(&i, WRITE, bvec, 1, bvec->bv_len);
file_start_write(file);
bw = vfs_iter_write(file, &i, ppos, 0);
file_start_write(file);
bw = vfs_iter_write(file, &i, ppos, 0);
@@
-347,7
+346,7
@@
static int lo_read_simple(struct loop_device *lo, struct request *rq,
ssize_t len;
rq_for_each_segment(bvec, rq, iter) {
ssize_t len;
rq_for_each_segment(bvec, rq, iter) {
- iov_iter_bvec(&i,
ITER_BVEC
, &bvec, 1, bvec.bv_len);
+ iov_iter_bvec(&i,
READ
, &bvec, 1, bvec.bv_len);
len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);
if (len < 0)
return len;
len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);
if (len < 0)
return len;
@@
-388,7
+387,7
@@
static int lo_read_transfer(struct loop_device *lo, struct request *rq,
b.bv_offset = 0;
b.bv_len = bvec.bv_len;
b.bv_offset = 0;
b.bv_len = bvec.bv_len;
- iov_iter_bvec(&i,
ITER_BVEC
, &b, 1, b.bv_len);
+ iov_iter_bvec(&i,
READ
, &b, 1, b.bv_len);
len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);
if (len < 0) {
ret = len;
len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);
if (len < 0) {
ret = len;
@@
-555,8
+554,7
@@
static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
}
atomic_set(&cmd->ref, 2);
}
atomic_set(&cmd->ref, 2);
- iov_iter_bvec(&iter, ITER_BVEC | rw, bvec,
- segments, blk_rq_bytes(rq));
+ iov_iter_bvec(&iter, rw, bvec, segments, blk_rq_bytes(rq));
iter.iov_offset = offset;
cmd->iocb.ki_pos = pos;
iter.iov_offset = offset;
cmd->iocb.ki_pos = pos;
@@
-1761,8
+1759,8
@@
static blk_status_t loop_queue_rq(struct blk_mq_hw_ctx *hctx,
/* always use the first bio's css */
#ifdef CONFIG_BLK_CGROUP
/* always use the first bio's css */
#ifdef CONFIG_BLK_CGROUP
- if (cmd->use_aio && rq->bio && rq->bio->bi_
blkg
) {
- cmd->css =
&bio_blkcg(rq->bio)->
css;
+ if (cmd->use_aio && rq->bio && rq->bio->bi_
css
) {
+ cmd->css =
rq->bio->bi_
css;
css_get(cmd->css);
} else
#endif
css_get(cmd->css);
} else
#endif