diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-08-31 16:20:37 -0700 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:34:03 +0200 |
| commit | 40cafcaa1a860c8f2dcce35677e766b2af6c3bb4 (patch) | |
| tree | 41bd79bfb34bb3a92081019c56de1747c926f056 | |
| parent | e22658816fdf281618cc487e16b76c9f80684727 (diff) | |
f2fs: set dentry bits on random location in memory
This fixes pointer panic when using inline_dentry, which was triggered when
backporting to 3.10.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/dir.c | 2 | ||||
| -rw-r--r-- | fs/f2fs/inline.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 9c90307cf..615f30cc4 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -511,7 +511,7 @@ void f2fs_update_dentry(nid_t ino, umode_t mode, struct f2fs_dentry_ptr *d, de->ino = cpu_to_le32(ino); set_de_type(de, mode); for (i = 0; i < slots; i++) { - test_and_set_bit_le(bit_pos + i, (void *)d->bitmap); + __set_bit_le(bit_pos + i, (void *)d->bitmap); /* avoid wrong garbage data for readdir */ if (i) (de + i)->name_len = 0; diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index c2bcde003..6c423bce8 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -565,7 +565,7 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page, inline_dentry = inline_data_addr(page); bit_pos = dentry - inline_dentry->dentry; for (i = 0; i < slots; i++) - test_and_clear_bit_le(bit_pos + i, + __clear_bit_le(bit_pos + i, &inline_dentry->dentry_bitmap); set_page_dirty(page); |