From patchwork Sat Apr 4 19:13:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 6161451 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 745DCBF4A6 for ; Sat, 4 Apr 2015 19:18:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 950B7203AD for ; Sat, 4 Apr 2015 19:18:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A2C4202DD for ; Sat, 4 Apr 2015 19:18:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753504AbbDDTSa (ORCPT ); Sat, 4 Apr 2015 15:18:30 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:39846 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752845AbbDDTNk (ORCPT ); Sat, 4 Apr 2015 15:13:40 -0400 Received: from mct2.qa.sw.ru ([10.29.1.63]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t34JDUJB024798; Sat, 4 Apr 2015 22:13:34 +0300 (MSK) From: Dmitry Monakhov To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk, Dmitry Monakhov Subject: [PATCH 02/16] vfs: check kiocb->ki_flags instead filp->fl_flags Date: Sat, 4 Apr 2015 23:13:11 +0400 Message-Id: <1428174805-853-3-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1428174805-853-1-git-send-email-dmonakhov@openvz.org> References: <1428174805-853-1-git-send-email-dmonakhov@openvz.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP generic_write_checks now accept kiocb as an argument Unfortunetly it is impossible to get rid of old interface because some crappy do not support write_iter interface so leave __generic_write_checks as backward compatibility helper. Signed-off-by: Dmitry Monakhov --- include/linux/fs.h | 8 +++++++- mm/filemap.c | 13 +++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 4c20030..992685e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2570,7 +2570,7 @@ extern int sb_min_blocksize(struct super_block *, int); extern int generic_file_mmap(struct file *, struct vm_area_struct *); extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *); -int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk); +int __generic_write_checks(struct file * file, loff_t *pos, size_t *count, int isblk, int append); extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *); extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *); extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *); @@ -2798,6 +2798,12 @@ static inline bool is_nonblock_kiocb(struct kiocb *kiocb) return kiocb->ki_flags & IOCB_NONBLOCK; } +static inline int generic_write_checks(struct kiocb *iocb, loff_t *pos, size_t *count, int isblk) +{ + return __generic_write_checks(iocb->ki_filp, pos, count, isblk, + is_append_kiocb(iocb)); +} + /* XXX: this is obsolete helper, and will be removed soon. * One should use io_direct_kiocb() instead */ static inline bool io_is_direct(struct file *filp) diff --git a/mm/filemap.c b/mm/filemap.c index 876f4e6..b519824 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1694,7 +1694,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) loff_t *ppos = &iocb->ki_pos; loff_t pos = *ppos; - if (io_is_direct(file)) { + if (is_direct_kiocb(iocb)) { struct address_space *mapping = file->f_mapping; struct inode *inode = mapping->host; size_t count = iov_iter_count(iter); @@ -2260,7 +2260,8 @@ EXPORT_SYMBOL(read_cache_page_gfp); * Returns appropriate error code that caller should return or * zero in case that write should be allowed. */ -inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk) +inline int __generic_write_checks(struct file *file, loff_t *pos, size_t *count, + int isblk, int is_append) { struct inode *inode = file->f_mapping->host; unsigned long limit = rlimit(RLIMIT_FSIZE); @@ -2270,7 +2271,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i if (!isblk) { /* FIXME: this is for backwards compatibility with 2.4 */ - if (file->f_flags & O_APPEND) + if (is_append) *pos = i_size_read(inode); if (limit != RLIM_INFINITY) { @@ -2333,7 +2334,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i } return 0; } -EXPORT_SYMBOL(generic_write_checks); +EXPORT_SYMBOL(__generic_write_checks); int pagecache_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, @@ -2565,7 +2566,7 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from) /* We can write back this queue in page reclaim */ current->backing_dev_info = inode_to_bdi(inode); - err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode)); + err = generic_write_checks(iocb, &pos, &count, S_ISBLK(inode->i_mode)); if (err) goto out; @@ -2582,7 +2583,7 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from) if (err) goto out; - if (io_is_direct(file)) { + if (is_direct_kiocb(iocb)) { loff_t endbyte; written = generic_file_direct_write(iocb, from, pos);