linux-next: manual merge of the vfs tree with Linus' tree
in [Kernel]
|
Prev: linux-next: manual merge of the vfs tree with the ext3 tree
Next: linux-next: build failure after merge of the vfs tree
From: Stephen Rothwell on 27 May 2010 21:40 Hi Al, Today's linux-next merge of the vfs tree got a conflict in include/linux/fs.h between commit facd07b07d2a7988f5ce849558838cc953847637 ("direct-io: add a hook for the fs to provide its own submit_bio function") from Linus' tree and commit 42e0df712d6a3573268d6be6bc97d113579e258c ("fs: introduce new truncate sequence") from the vfs tree. Just overlapping additions. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc include/linux/fs.h index 85e823a,357ebcf..0000000 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@@ -2251,11 -2251,10 +2252,15 @@@ static inline int xip_truncate_page(str #endif #ifdef CONFIG_BLOCK +struct bio; +typedef void (dio_submit_t)(int rw, struct bio *bio, struct inode *inode, + loff_t file_offset); +void dio_end_io(struct bio *bio, int error); + + ssize_t __blockdev_direct_IO_newtrunc(int rw, struct kiocb *iocb, struct inode *inode, + struct block_device *bdev, const struct iovec *iov, loff_t offset, + unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io, + int lock_type); ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, struct block_device *bdev, const struct iovec *iov, loff_t offset, unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |