Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/ext4/fsync.c between commit 14ece1028b3ed53ffec1b1213ffc6acaf79ad77c
("ext4: Make fsync sync new parent directories in no-journal mode") from
Linus' tree and commits 05b2fc7d1f1046fef1199e1a4d2f63df998ef3aa ("drop
unused dentry argument to ->fsync") and
8f1edffdb5a76f205cf45070e1552ee8b2239a2b ("rename the generic fsync
implementations") from the vfs tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc fs/ext4/fsync.c
index b6a74f9,8000c7a..0000000
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@@ -89,13 -66,9 +89,13 @@@ int ext4_sync_file(struct file *file, i
ret = flush_completed_IO(inode);
if (ret < 0)
return ret;
-
- if (!journal)
- return generic_file_fsync(file, datasync);
+
+ if (!journal) {
- ret = simple_fsync(file, dentry, datasync);
++ ret = generic_file_fsync(file, datasync);
+ if (!ret && !list_empty(&inode->i_dentry))
+ ext4_sync_parent(inode);
+ return ret;
+ }
/*
* data=writeback,ordered:
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
