On Thu, 2012-05-10 at 21:36 -0400, Paul Gortmaker wrote: > On Thu, May 10, 2012 at 5:23 PM, Randy Dunlap <rdunlap@xxxxxxxxxxxx> wrote: > > On 05/10/2012 02:26 AM, Stephen Rothwell wrote: > > > >> Hi all, > >> > >> Changes since 20120508: > > > > > > when CONFIG_BLOCK is not set: > > > > fs/inode.c:1777:6: error: redefinition of 'inode_dio_wait' > > include/linux/fs.h:2476:20: note: previous definition of 'inode_dio_wait' > > was here > > Also seen on some arm builds: > > http://kisskb.ellerman.id.au/kisskb/buildresult/6291357/ > http://kisskb.ellerman.id.au/kisskb/buildresult/6291378/ > > 5eff3957ce8d14c2a254844743dfb84e19e7c2ae is the first bad commit > commit 5eff3957ce8d14c2a254844743dfb84e19e7c2ae > Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> > Date: Mon May 7 10:44:29 2012 -0400 > > NFS: Ensure that setattr and getattr wait for O_DIRECT write completion > > Use the same mechanism as the block devices are using, but move the > helper functions from fs/direct-io.c into fs/inode.c to remove the > dependency on CONFIG_BLOCK. > > Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> > Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> > Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> > Cc: Fred Isaman <iisaman@xxxxxxxxxx> > > :040000 040000 ae33e2ffd172e4d7e2ad6ed219de32de936548cc > ef2df66b34559dbc0782add108e24a6ef6e4e2ca M fs > bisect run success > > P. Sorry about being so late with this. The changes to include/linux/fs.h had not been committed in the original branch. Today's linux-next should have that fixed... Cheers Trond -- Trond Myklebust Linux NFS client maintainer NetApp Trond.Myklebust@xxxxxxxxxx www.netapp.com ��.n��������+%������w��{.n�����{��w����ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f