From: Jan Kara <jack@suse.cz>
To: LKML <linux-kernel@vger.kernel.org>
Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
Jan Kara <jack@suse.cz>
Subject: [PATCH 4/6] fs: Don't call dio_cleanup() before submitting all bios
Date: Thu, 31 Jan 2013 22:49:52 +0100 [thread overview]
Message-ID: <1359668994-13433-5-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1359668994-13433-1-git-send-email-jack@suse.cz>
do_blockdev_direct_IO() can call dio_cleanup() before submitting
all bios. This will be inconvenient for us because we need to keep
preallocated structure in sdio which we attach to bio on submit and
it is natural to cleanup unused allocation in dio_cleanup().
Since dio_cleanup() is called again after submitting the last bio it is
enough to just remove the first dio_cleanup() call.
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/direct-io.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/fs/direct-io.c b/fs/direct-io.c
index cf5b44b..3a430f3 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1209,10 +1209,8 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
((sdio.final_block_in_request - sdio.block_in_file) <<
blkbits);
- if (retval) {
- dio_cleanup(dio, &sdio);
+ if (retval)
break;
- }
} /* end iovec loop */
if (retval == -ENOTBLK) {
--
1.7.1
next prev parent reply other threads:[~2013-01-31 21:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-31 21:49 [PATCH 0/6 RFC] Mapping range lock Jan Kara
2013-01-31 21:49 ` [PATCH 1/6] lib: Implement range locks Jan Kara
2013-01-31 23:57 ` Andrew Morton
2013-02-04 16:41 ` Jan Kara
2013-02-11 5:42 ` Michel Lespinasse
2013-02-11 10:27 ` Jan Kara
2013-02-11 11:03 ` Michel Lespinasse
2013-02-11 12:58 ` Jan Kara
2013-01-31 21:49 ` [PATCH 2/6] fs: Take mapping lock in generic read paths Jan Kara
2013-01-31 23:59 ` Andrew Morton
2013-02-04 12:47 ` Jan Kara
2013-02-08 14:59 ` Jan Kara
2013-01-31 21:49 ` [PATCH 3/6] fs: Provide function to take mapping lock in buffered write path Jan Kara
2013-01-31 21:49 ` Jan Kara [this message]
2013-01-31 21:49 ` [PATCH 5/6] fs: Take mapping lock during direct IO Jan Kara
2013-01-31 21:49 ` [PATCH 6/6] ext3: Convert ext3 to use mapping lock Jan Kara
2013-02-01 0:07 ` [PATCH 0/6 RFC] Mapping range lock Andrew Morton
2013-02-04 9:29 ` Zheng Liu
2013-02-04 12:38 ` Jan Kara
2013-02-05 23:25 ` Dave Chinner
2013-02-06 19:25 ` Jan Kara
2013-02-07 2:43 ` Dave Chinner
2013-02-07 11:06 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359668994-13433-5-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).