Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c4af96449e20f9245cf3d904098db508cdebcda8

Authored by Akinobu Mita
Committed by Linus Torvalds
1 parent bcc54e2a6d
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ntfs: use bitmap_weight 

Use bitmap_weight() instead of doing hweight32() for each u32 element in
the page.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Anton Altaparmakov <aia21@cantab.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 13 additions and 12 deletions Side-by-side Diff

... ... @@ -31,6 +31,7 @@
31 31 #include <linux/vfs.h>
32 32 #include <linux/moduleparam.h>
33 33 #include <linux/smp_lock.h>
  34 +#include <linux/bitmap.h>
34 35  
35 36 #include "sysctl.h"
36 37 #include "logfile.h"
... ... @@ -2458,7 +2459,6 @@
2458 2459 static s64 get_nr_free_clusters(ntfs_volume *vol)
2459 2460 {
2460 2461 s64 nr_free = vol->nr_clusters;
2461   - u32 *kaddr;
2462 2462 struct address_space *mapping = vol->lcnbmp_ino->i_mapping;
2463 2463 struct page *page;
2464 2464 pgoff_t index, max_index;
... ... @@ -2477,7 +2477,8 @@
2477 2477 ntfs_debug("Reading $Bitmap, max_index = 0x%lx, max_size = 0x%lx.",
2478 2478 max_index, PAGE_CACHE_SIZE / 4);
2479 2479 for (index = 0; index < max_index; index++) {
2480   - unsigned int i;
  2480 + unsigned long *kaddr;
  2481 +
2481 2482 /*
2482 2483 * Read the page from page cache, getting it from backing store
2483 2484 * if necessary, and increment the use count.
2484 2485  
2485 2486  
... ... @@ -2490,16 +2491,16 @@
2490 2491 nr_free -= PAGE_CACHE_SIZE * 8;
2491 2492 continue;
2492 2493 }
2493   - kaddr = (u32*)kmap_atomic(page, KM_USER0);
  2494 + kaddr = kmap_atomic(page, KM_USER0);
2494 2495 /*
2495   - * For each 4 bytes, subtract the number of set bits. If this
  2496 + * Subtract the number of set bits. If this
2496 2497 * is the last page and it is partial we don't really care as
2497 2498 * it just means we do a little extra work but it won't affect
2498 2499 * the result as all out of range bytes are set to zero by
2499 2500 * ntfs_readpage().
2500 2501 */
2501   - for (i = 0; i < PAGE_CACHE_SIZE / 4; i++)
2502   - nr_free -= (s64)hweight32(kaddr[i]);
  2502 + nr_free -= bitmap_weight(kaddr,
  2503 + PAGE_CACHE_SIZE * BITS_PER_BYTE);
2503 2504 kunmap_atomic(kaddr, KM_USER0);
2504 2505 page_cache_release(page);
2505 2506 }
... ... @@ -2538,7 +2539,6 @@
2538 2539 static unsigned long __get_nr_free_mft_records(ntfs_volume *vol,
2539 2540 s64 nr_free, const pgoff_t max_index)
2540 2541 {
2541   - u32 *kaddr;
2542 2542 struct address_space *mapping = vol->mftbmp_ino->i_mapping;
2543 2543 struct page *page;
2544 2544 pgoff_t index;
... ... @@ -2548,7 +2548,8 @@
2548 2548 ntfs_debug("Reading $MFT/$BITMAP, max_index = 0x%lx, max_size = "
2549 2549 "0x%lx.", max_index, PAGE_CACHE_SIZE / 4);
2550 2550 for (index = 0; index < max_index; index++) {
2551   - unsigned int i;
  2551 + unsigned long *kaddr;
  2552 +
2552 2553 /*
2553 2554 * Read the page from page cache, getting it from backing store
2554 2555 * if necessary, and increment the use count.
2555 2556  
2556 2557  
... ... @@ -2561,16 +2562,16 @@
2561 2562 nr_free -= PAGE_CACHE_SIZE * 8;
2562 2563 continue;
2563 2564 }
2564   - kaddr = (u32*)kmap_atomic(page, KM_USER0);
  2565 + kaddr = kmap_atomic(page, KM_USER0);
2565 2566 /*
2566   - * For each 4 bytes, subtract the number of set bits. If this
  2567 + * Subtract the number of set bits. If this
2567 2568 * is the last page and it is partial we don't really care as
2568 2569 * it just means we do a little extra work but it won't affect
2569 2570 * the result as all out of range bytes are set to zero by
2570 2571 * ntfs_readpage().
2571 2572 */
2572   - for (i = 0; i < PAGE_CACHE_SIZE / 4; i++)
2573   - nr_free -= (s64)hweight32(kaddr[i]);
  2573 + nr_free -= bitmap_weight(kaddr,
  2574 + PAGE_CACHE_SIZE * BITS_PER_BYTE);
2574 2575 kunmap_atomic(kaddr, KM_USER0);
2575 2576 page_cache_release(page);
2576 2577 }