summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2016-08-31 16:20:37 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2016-09-07 18:53:47 -0700
commit6bf6b267d27d381fd43d2ac6152fa25de716ceaa (patch)
tree2a205f760dc8336cf7fa5ab262348c675835bb22 /fs
parentc2a080aefa94c4b3dad35fbd9fa6cd0c8039b128 (diff)
downloadlinux-6bf6b267d27d381fd43d2ac6152fa25de716ceaa.tar.gz
linux-6bf6b267d27d381fd43d2ac6152fa25de716ceaa.tar.bz2
linux-6bf6b267d27d381fd43d2ac6152fa25de716ceaa.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/f2fs/dir.c2
-rw-r--r--fs/f2fs/inline.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 9316d8a0ed95..2fb20fc58346 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -510,7 +510,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 8a961072d6ae..4d526f3d04b2 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -566,7 +566,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);