diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
| commit | bfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch) | |
| tree | a50287c88fdc60a73912d205d7bce41b7af53827 /fs/f2fs/dir.c | |
| parent | device-dax: utilize new cdev_device_add helper function (diff) | |
| parent | x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions (diff) | |
| download | linux-dev-bfca9acf1a5df0ff98fbf47e363adb48612bb7ec.tar.xz linux-dev-bfca9acf1a5df0ff98fbf47e363adb48612bb7ec.zip | |
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
Diffstat (limited to 'fs/f2fs/dir.c')
| -rw-r--r-- | fs/f2fs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 4650c9b85de7..8d5c62b07b28 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -750,7 +750,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, dentry_blk = page_address(page); bit_pos = dentry - dentry_blk->dentry; for (i = 0; i < slots; i++) - clear_bit_le(bit_pos + i, &dentry_blk->dentry_bitmap); + __clear_bit_le(bit_pos + i, &dentry_blk->dentry_bitmap); /* Let's check and deallocate this dentry page */ bit_pos = find_next_bit_le(&dentry_blk->dentry_bitmap, |