[linux-next] fs/ocfs2/file.c:201: error: âBLKDEV_IFL_WAITâ undeclared (first use in this function)

[Sedat Dilek]

Hi,

I pulled linux-2.6-block/for-next into mainline.

The build breaks, the issue is known [1] (but I didnt see a patch):

[ build.log ]
...
/home/sd/src/linux-2.6/linux-2.6.36-rc4/debian/build/source_i386_none/fs/ocfs2/file.c:201:
error: âBLKDEV_IFL_WAITâ undeclared (first use in this function)
/home/sd/src/linux-2.6/linux-2.6.36-rc4/debian/build/source_i386_none/fs/ocfs2/file.c:201:
error: (Each undeclared identifier is reported only once
/home/sd/src/linux-2.6/linux-2.6.36-rc4/debian/build/source_i386_none/fs/ocfs2/file.c:201:
error: for each function it appears in.)
/home/sd/src/linux-2.6/linux-2.6.36-rc4/debian/build/source_i386_none/fs/ocfs2/file.c:201:
error: too many arguments to function âblkdev_issue_flushâ
  CC [M]  net/rxrpc/ar-error.o
  CC [M]  drivers/scsi/scsi_error.o
make[3]: *** [sub-make] Error 2
make[2]: *** [all] Error 2

Regards,
- Sedat -

[1] http://www.spinics.net/lists/linux-next/msg11970.html

P.S.: Is there an email-address for linux-next (did not see in MAINTAINERS)?
Index: linux-next/fs/ocfs2/file.c
===================================================================
--- linux-next.orig/fs/ocfs2/file.c
+++ linux-next/fs/ocfs2/file.c
@@ -198,7 +198,7 @@ static int ocfs2_sync_file(struct file *
 		 */
 		if (osb->s_mount_opt & OCFS2_MOUNT_BARRIER)
 			blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL,
-					   NULL, BLKDEV_IFL_WAIT);
+					   NULL);
 		goto bail;
 	}