summaryrefslogtreecommitdiffstats
path: root/fs/ext4/dir.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-03-03 11:31:09 +0100
committerPaul Mackerras <paulus@samba.org>2008-03-03 11:31:09 +0100
commit3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch)
treee7c2995ddc2690d1be695a1525bcd16d3965548d /fs/ext4/dir.c
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spu... (diff)
parent[POWERPC] Convert the cell IOMMU fixed mapping to 16M IOMMU pages (diff)
downloadlinux-3cecdda3f169f22f324f78fd544beee68e3cc6a4.tar.xz
linux-3cecdda3f169f22f324f78fd544beee68e3cc6a4.zip
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'fs/ext4/dir.c')
-rw-r--r--fs/ext4/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 33888bb58144..2c23bade9aa6 100644
--- 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,
};