lkml.org 
[lkml]   [2010]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/30] block/loop: implement REQ_FLUSH/FUA support
    Date
    Deprecate REQ_HARDBARRIER and implement REQ_FLUSH/FUA instead.  Also,
    instead of checking file->f_op->fsync() directly, look at the value of
    vfs_fsync() and ignore -EINVAL return.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    ---
    drivers/block/loop.c | 18 +++++++++---------
    1 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/block/loop.c b/drivers/block/loop.c
    index 953d1e1..5d27bc6 100644
    --- a/drivers/block/loop.c
    +++ b/drivers/block/loop.c
    @@ -477,17 +477,17 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio)
    pos = ((loff_t) bio->bi_sector << 9) + lo->lo_offset;

    if (bio_rw(bio) == WRITE) {
    - bool barrier = (bio->bi_rw & REQ_HARDBARRIER);
    struct file *file = lo->lo_backing_file;

    - if (barrier) {
    - if (unlikely(!file->f_op->fsync)) {
    - ret = -EOPNOTSUPP;
    - goto out;
    - }
    + /* REQ_HARDBARRIER is deprecated */
    + if (bio->bi_rw & REQ_HARDBARRIER) {
    + ret = -EOPNOTSUPP;
    + goto out;
    + }

    + if (bio->bi_rw & REQ_FLUSH) {
    ret = vfs_fsync(file, 0);
    - if (unlikely(ret)) {
    + if (unlikely(ret && ret != -EINVAL)) {
    ret = -EIO;
    goto out;
    }
    @@ -495,9 +495,9 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio)

    ret = lo_send(lo, bio, pos);

    - if (barrier && !ret) {
    + if ((bio->bi_rw & REQ_FUA) && !ret) {
    ret = vfs_fsync(file, 0);
    - if (unlikely(ret))
    + if (unlikely(ret && ret != -EINVAL))
    ret = -EIO;
    }
    } else
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-08-25 18:01    [W:0.025 / U:0.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site