From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932440AbcEROZx (ORCPT ); Wed, 18 May 2016 10:25:53 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:59810 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932243AbcEROZv (ORCPT ); Wed, 18 May 2016 10:25:51 -0400 From: Arnd Bergmann To: Stephen Rothwell Cc: Al Viro , "Theodore Ts'o" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Jan Kara Subject: Re: linux-next: manual merge of the vfs tree with the ext4 tree Date: Wed, 18 May 2016 16:25:39 +0200 Message-ID: <3539720.FHqN9VOtTL@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20160517102355.4be4af45@canb.auug.org.au> References: <20160517102355.4be4af45@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:9Zxk3ZgHyCiINQL8WxQ1U9JtIjnk2Glj7vbB4CcjWQbTkjLqBiJ AKzAd4yo/KekfyipVRGfRaIXjV8QYRqeyXlAs3vFQOCEpojnEbphskKVXlzpoopA0s/Ovo0 0ERYp763bbaQpx9A0uNzB9HJKLBPfAgoaVOWYJpss8ARtw0mhEZI+ndowEAskwqGXg/jel0 So/K3SUTXTpbxTPw9UGYw== X-UI-Out-Filterresults: notjunk:1;V01:K0:46QTg96RUjc=:4HhywqpDuVd39MhRXLjxgS WYyApnvELagWmF/x4A3TqPEgQKbZoRG9YmFiF/hFG6SHlY79A6Fvmjc47osZgXX+UsDdCphxE teH7qNgP+llKmjStVJTJ0zObBDQVxDro0exXNa9pIywE2vzj7IvHc9a6CHisv40AavwtDITy0 VMxmQhVymY8epbvUxH2+sw2T19n1wUyI+txqVlx4FVBJfNbtKo2IZez4Jq1X/PGlTGDjja1NV PFlXOxeZXbY57bPayJngn9GsQ+d4ZDpBuo8poSjL8CZMSz+EghQRxuaGPvoIpWF43Mo0l00U6 QU/TPhdKaXS/6koeIPbq/oe8ofLJimJC9K8bfVz1hUepTKQulpUfqkqugTpbaU2nDvbvibnWJ Bk8iPApokrJ4jNbV9G2cvX2cMxwdKFG9ve9tf3sbewuPg74ywDncD+0Z1tWe5mRU7SVG1dguY IHO+5Gd8a0qcdi4GC1E0a2EDGMa4tKSQrEtBsO6d17kYG6BS0Q0u7YvmsOTJnLi0aL1OgNowI N65Wr2ptoh4Hw+2sG1t+cu3YO7OJT2QlyzyiM5hyQo8TkKXSjch1H7NTf113I3/IZRQq+w77t 5BdnQrm0U2UY8xWcJL+R/jEe2JH/JjmV+KKl2HgFTg8VSMl35siogR2kBfNIquHUzERGQe+SD 6lnCgZWD0D0kVG5dxuE0xOy/6QUFQMLNxfkF0wLxnjfEMC7W8bjWR54UOPhOIdCrqNG6JX1YE WCnh6/7onJ+Sf0CIq9q5UfLqd6k+DOLGmQMadw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday 17 May 2016 10:23:55 Stephen Rothwell wrote: > ++static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter) > +{ > + int unlocked = 0; > + struct inode *inode = iocb->ki_filp->f_mapping->host; > ++ loff_t offset = iocb->ki_pos; > + ssize_t ret; > + > + if (ext4_should_dioread_nolock(inode)) { > + /* > + * Nolock dioread optimization may be dynamically disabled > + * via ext4_inode_block_unlocked_dio(). Check inode's state > + * while holding extra i_dio_count ref. > + */ > + inode_dio_begin(inode); > + smp_mb(); > + if (unlikely(ext4_test_inode_state(inode, > + EXT4_STATE_DIOREAD_LOCK))) > + inode_dio_end(inode); > + else > + unlocked = 1; > + } > + if (IS_DAX(inode)) { > - ret = dax_do_io(iocb, inode, iter, offset, ext4_dio_get_block, > ++ ret = dax_do_io(iocb, inode, iter, ext4_dio_get_block, > + NULL, unlocked ? 0 : DIO_LOCKING); > + } else { > + ret = __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, > - iter, offset, ext4_dio_get_block, > ++ iter, ext4_dio_get_block, > + NULL, NULL, > + unlocked ? 0 : DIO_LOCKING); > + } > + if (unlocked) > + inode_dio_end(inode); > return ret; > } > I'm getting a warning here because the 'offset' variable is no longer used, I've fixed it up on my test box like this: commit 21fffc41b151a6146981487a3fee974e33c7005e Author: Arnd Bergmann Date: Tue May 17 13:23:39 2016 +0200 ext4: fix linux-next mismerge fs/ext4/inode.c: In function 'ext4_direct_IO_read': fs/ext4/inode.c:3502:9: error: unused variable 'offset' [-Werror=unused-variable] loff_t offset = iocb->ki_pos; Signed-off-by: Arnd Bergmann diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index cd72f208c405..f7140ca66e3b 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3499,7 +3499,6 @@ static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter) { int unlocked = 0; struct inode *inode = iocb->ki_filp->f_mapping->host; - loff_t offset = iocb->ki_pos; ssize_t ret; if (ext4_should_dioread_nolock(inode)) {