diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:05:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:05:05 -0800 |
| commit | 3512a79dbcc90e6edac98717607bd821bba50a14 (patch) | |
| tree | 9038e3545ccdfec77ec24d982f8cc24701fb532d /fs/ext4/ext4.h | |
| parent | 39a65762d4c48fd8a498f34b7fec74a6b0aebd55 (diff) | |
| parent | 090542641de833c6f756895fc2f139f046e298f9 (diff) | |
| download | blackbird-op-linux-3512a79dbcc90e6edac98717607bd821bba50a14.tar.gz blackbird-op-linux-3512a79dbcc90e6edac98717607bd821bba50a14.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: Fix NULL dereference in ext4_ext_migrate()'s error handling
ext4: Implement range_cyclic in ext4_da_writepages instead of write_cache_pages
ext4: Initialize preallocation list_head's properly
ext4: Fix lockdep warning
ext4: Fix to read empty directory blocks correctly in 64k
jbd2: Avoid possible NULL dereference in jbd2_journal_begin_ordered_truncate()
Revert "ext4: wait on all pending commits in ext4_sync_fs()"
jbd2: Fix return value of jbd2_journal_start_commit()
Diffstat (limited to 'fs/ext4/ext4.h')
| -rw-r--r-- | fs/ext4/ext4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index aafc9eba1c25..b0c87dce66a3 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -868,7 +868,7 @@ static inline unsigned ext4_rec_len_from_disk(__le16 dlen) { unsigned len = le16_to_cpu(dlen); - if (len == EXT4_MAX_REC_LEN) + if (len == EXT4_MAX_REC_LEN || len == 0) return 1 << 16; return len; } |
