Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

filesystem-dax: Do not request kaddr and pfn when not required

Some functions within fs/dax don't need to get local pointer kaddr
or variable pfn from direct_access. Using NULL instead of having to
pass in useless pointer or variable that caller then just throw away.

Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>

authored by

Huaisheng Ye and committed by
Dave Jiang
86ed913b f742267a

+4 -9
+4 -9
fs/dax.c
··· 647 647 { 648 648 void *vto, *kaddr; 649 649 pgoff_t pgoff; 650 - pfn_t pfn; 651 650 long rc; 652 651 int id; 653 652 ··· 655 656 return rc; 656 657 657 658 id = dax_read_lock(); 658 - rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, &pfn); 659 + rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, NULL); 659 660 if (rc < 0) { 660 661 dax_read_unlock(id); 661 662 return rc; ··· 966 967 { 967 968 const sector_t sector = dax_iomap_sector(iomap, pos); 968 969 pgoff_t pgoff; 969 - void *kaddr; 970 970 int id, rc; 971 971 long length; 972 972 ··· 974 976 return rc; 975 977 id = dax_read_lock(); 976 978 length = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(size), 977 - &kaddr, pfnp); 979 + NULL, pfnp); 978 980 if (length < 0) { 979 981 rc = length; 980 982 goto out; ··· 1050 1052 pgoff_t pgoff; 1051 1053 long rc, id; 1052 1054 void *kaddr; 1053 - pfn_t pfn; 1054 1055 1055 1056 rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff); 1056 1057 if (rc) 1057 1058 return rc; 1058 1059 1059 1060 id = dax_read_lock(); 1060 - rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr, 1061 - &pfn); 1061 + rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL); 1062 1062 if (rc < 0) { 1063 1063 dax_read_unlock(id); 1064 1064 return rc; ··· 1112 1116 ssize_t map_len; 1113 1117 pgoff_t pgoff; 1114 1118 void *kaddr; 1115 - pfn_t pfn; 1116 1119 1117 1120 if (fatal_signal_pending(current)) { 1118 1121 ret = -EINTR; ··· 1123 1128 break; 1124 1129 1125 1130 map_len = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), 1126 - &kaddr, &pfn); 1131 + &kaddr, NULL); 1127 1132 if (map_len < 0) { 1128 1133 ret = map_len; 1129 1134 break;