From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753640AbcCUJQG (ORCPT ); Mon, 21 Mar 2016 05:16:06 -0400 Received: from mx2.suse.de ([195.135.220.15]:54933 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751842AbcCUJQB (ORCPT ); Mon, 21 Mar 2016 05:16:01 -0400 Date: Mon, 21 Mar 2016 10:16:28 +0100 From: Jan Kara To: Dave Chinner Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, xfs@oss.sgi.com, jack@suse.cz, tytso@mit.edu Subject: Re: [GIT PULL] xfs: updates for 4.6-rc1 Message-ID: <20160321091628.GE30819@quack.suse.cz> References: <20160321020505.GJ11812@dastard> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160321020505.GJ11812@dastard> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon 21-03-16 13:05:05, Dave Chinner wrote: The resolution of conflict in fs/ext4/inode.c is fine except for one minor issue: > diff --cc fs/ext4/inode.c > index b2e9576,2b98171..e5ba3b0 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@@ -3289,10 -3161,10 +3289,10 @@@ out > } > #endif > > - static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset, > + static int ext4_end_io_dio(struct kiocb *iocb, loff_t offset, > ssize_t size, void *private) > { > - ext4_io_end_t *io_end = iocb->private; > + ext4_io_end_t *io_end = private; > > /* if not async direct IO just return */ > if (!io_end) > @@@ -3300,8 -3172,18 +3300,17 @@@ > > ext_debug("ext4_end_io_dio(): io_end 0x%p " > "for inode %lu, iocb 0x%p, offset %llu, size %zd\n", > - iocb->private, io_end->inode->i_ino, iocb, offset, > - size); > + io_end, io_end->inode->i_ino, iocb, offset, size); > > + iocb->private = NULL; The line above should not exist in the result. It does no harm but is unnecessary. Honza -- Jan Kara SUSE Labs, CR