Hi Arnd,
On Wed, 18 May 2016 16:25:39 +0200 Arnd Bergmann <a...@arndb.de> wrote:
>
> 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:
Thanks. I have applied that to linux-next today and fixed up the merge
fix patch from tomorrow.
> commit 21fffc41b151a6146981487a3fee974e33c7005e
> Author: Arnd Bergmann <a...@arndb.de>
> 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 <a...@arndb.de>
>
> 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)) {
--
Cheers,
Stephen Rothwell
