diff options
author | Paul Mackerras <paulus@samba.org> | 2008-03-03 11:31:09 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 11:31:09 +0100 |
commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /fs/ext4/dir.c | |
parent | Merge 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) | |
download | linux-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.c | 2 |
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, }; |