linux-next: manual merge of the vfs tree with the ext3 tree
in [Kernel]
|
Prev: linux-next: manual merge of the vfs tree with the logfs tree
Next: linux-next: manual merge of the vfs tree with Linus' 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 fs/ufs/file.c between commit 8f45c33decf62e1aaaa9411aae8fef6a38f95845 ("ufs: Remove dead quota code") from the ext3 tree and commit 8f1edffdb5a76f205cf45070e1552ee8b2239a2b ("rename the generic fsync implementations") from the vfs tree. Just context changes. 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 fs/ufs/file.c index 73655c6,d4c30d1..0000000 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c @@@ -40,7 -41,7 +40,7 @@@ const struct file_operations ufs_file_o .write = do_sync_write, .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, - .open = dquot_file_open, + .open = generic_file_open, - .fsync = simple_fsync, + .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, }; -- 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/ |