From patchwork Fri Sep 29 15:50:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goldwyn Rodrigues X-Patchwork-Id: 9978303 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AAB8560311 for ; Fri, 29 Sep 2017 15:50:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BB36297BE for ; Fri, 29 Sep 2017 15:50:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90923297EA; Fri, 29 Sep 2017 15:50:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27676297BE for ; Fri, 29 Sep 2017 15:50:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752006AbdI2Puj (ORCPT ); Fri, 29 Sep 2017 11:50:39 -0400 Received: from mx2.suse.de ([195.135.220.15]:57755 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751975AbdI2Puj (ORCPT ); Fri, 29 Sep 2017 11:50:39 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id F1B77AE72; Fri, 29 Sep 2017 15:50:37 +0000 (UTC) From: Goldwyn Rodrigues To: linux-fsdevel@vger.kernel.org Cc: hch@infradead.org, willy@infradead.org, Goldwyn Rodrigues Subject: [PATCH v3] Return bytes transferred for partial direct I/O Date: Fri, 29 Sep 2017 10:50:30 -0500 Message-Id: <20170929155030.7726-1-rgoldwyn@suse.de> X-Mailer: git-send-email 2.14.1 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In case direct I/O encounters an error midway, it returns the error. Instead it should be returning the number of bytes transferred so far. Test case for filesystems (with ENOSPC): 1. Create an almost full filesystem 2. Create a file, say /mnt/lastfile, until the filesystem is full. 3. Direct write() with count > sizeof /mnt/lastfile. Result: write() returns -ENOSPC. However, file content has data written in step 3. Signed-off-by: Goldwyn Rodrigues Changes since v1: - incorporated iomap and block devices Changes since v2: - realized that file size was not increasing when performing a (partial) direct I/O because end_io function was receiving the error instead of size in iomap's dio end io. Fixed. Reviewed-by: Christoph Hellwig diff --git a/fs/block_dev.c b/fs/block_dev.c index 93d088ffc05c..1c6640ffb929 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -421,7 +421,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) if (!ret) ret = blk_status_to_errno(dio->bio.bi_status); - if (likely(!ret)) + if (likely(dio->size)) ret = dio->size; bio_put(&dio->bio); diff --git a/fs/direct-io.c b/fs/direct-io.c index 5fa2211e49ae..0fc1789498ae 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -255,8 +255,6 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) ret = dio->page_errors; if (ret == 0) ret = dio->io_error; - if (ret == 0) - ret = transferred; if (dio->end_io) { int err; @@ -284,7 +282,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async) } kmem_cache_free(dio_cache, dio); - return ret; + return transferred ? transferred : ret; } static void dio_aio_complete_work(struct work_struct *work) diff --git a/fs/iomap.c b/fs/iomap.c index 269b24a01f32..019c4d993300 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -714,28 +714,29 @@ static ssize_t iomap_dio_complete(struct iomap_dio *dio) { struct kiocb *iocb = dio->iocb; ssize_t ret; + ssize_t transferred = 0; if (dio->end_io) { ret = dio->end_io(iocb, - dio->error ? dio->error : dio->size, + dio->size ? dio->size : dio->error, dio->flags); } else { ret = dio->error; } - if (likely(!ret)) { - ret = dio->size; + if (likely(dio->size)) { + transferred = dio->size; /* check for short read */ - if (iocb->ki_pos + ret > dio->i_size && + if (iocb->ki_pos + transferred > dio->i_size && !(dio->flags & IOMAP_DIO_WRITE)) - ret = dio->i_size - iocb->ki_pos; - iocb->ki_pos += ret; + transferred = dio->i_size - iocb->ki_pos; + iocb->ki_pos += transferred; } inode_dio_end(file_inode(iocb->ki_filp)); kfree(dio); - return ret; + return transferred ? transferred : ret; } static void iomap_dio_complete_work(struct work_struct *work)