Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / fs / ext4 / dir.c

diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 33888bb58144fc1660d4106dbcbd689b560d2aa0..2c23bade9aa676451972905449e8d8cc0bbcfec3 100644 (file)
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -46,7 +46,7 @@ const struct file_operations ext4_dir_operations = {
 #ifdef CONFIG_COMPAT
        .compat_ioctl   = ext4_compat_ioctl,
 #endif
-       .fsync          = ext4_sync_file,       /* BKL held */
+       .fsync          = ext4_sync_file,
        .release        = ext4_release_dir,
 };