summaryrefslogtreecommitdiffstats
path: root/fs/ext4/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-26 07:50:16 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-26 07:50:16 -0800
commitadefe11c5383face09068176af7dd4e3a80d8f6b (patch)
tree9a24b21e5b5ab6ae721c3b09f28bb3901e246705 /fs/ext4/dir.c
parent3d6ce332537ad0a6f77caa469e09d7335187767b (diff)
parent5606bf5d0cbfbc3dfa78793a3793c43dd045fb1b (diff)
downloadkernel-crypto-adefe11c5383face09068176af7dd4e3a80d8f6b.tar.gz
kernel-crypto-adefe11c5383face09068176af7dd4e3a80d8f6b.tar.xz
kernel-crypto-adefe11c5383face09068176af7dd4e3a80d8f6b.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: add missing ext4_journal_stop() ext4: ext4_find_next_zero_bit needs an aligned address on some arch ext4: set EXT4_EXTENTS_FL only for directory and regular files ext4: Don't mark filesystem error if fallocate fails ext4: Fix BUG when writing to an unitialized extent ext4: Don't use ext4_dec_count() if not needed ext4: modify block allocation algorithm for the last group ext4: Don't claim block from group which has corrupt bitmap ext4: Get journal write access before modifying the extent tree ext4: Fix memory and buffer head leak in callers to ext4_ext_find_extent() ext4: Don't leave behind a half-created inode if ext4_mkdir() fails ext4: Fix kernel BUG at fs/ext4/mballoc.c:910! ext4: Fix locking hierarchy violation in ext4_fallocate() Remove incorrect BKL comments in ext4
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 33888bb5814..2c23bade9aa 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,
};