Re: [PATCH v6 01/14] vdso/datastore: Reduce scope of some variables in vvar_fault()
"Christophe Leroy (CS GROUP)" <[email protected]>
| Newsgroups | org.kernel.vger.sparclinux,dev.linux.lists.loongarch,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-kernel,org.kernel.vger.linux-kselftest,org.kernel.vger.linux-mips,org.kernel.vger.linux-s390,org.ozlabs.lists.linuxppc-dev |
|---|---|
| Message-ID | <[email protected]> |
Le 04/03/2026 à 08:48, Thomas Weißschuh a écrit : > These variables are only used inside a single branch. > > Move their declarations there. > > Signed-off-by: Thomas Weißschuh <[email protected]> > Tested-by: Andreas Larsson <[email protected]> > Reviewed-by: Andreas Larsson <[email protected]> Reviewed-by: Christophe Leroy (CS GROUP) <[email protected]> > --- > lib/vdso/datastore.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/lib/vdso/datastore.c b/lib/vdso/datastore.c > index a565c30c71a0..2cca4e84e5b5 100644 > --- a/lib/vdso/datastore.c > +++ b/lib/vdso/datastore.c > @@ -41,8 +41,7 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm, > struct vm_area_struct *vma, struct vm_fault *vmf) > { > struct page *timens_page = find_timens_vvar_page(vma); > - unsigned long addr, pfn; > - vm_fault_t err; > + unsigned long pfn; > > switch (vmf->pgoff) { > case VDSO_TIME_PAGE_OFFSET: > @@ -54,6 +53,9 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm, > * Fault in VVAR page too, since it will be accessed > * to get clock data anyway. > */ > + unsigned long addr; > + vm_fault_t err; > + > addr = vmf->address + VDSO_TIMENS_PAGE_OFFSET * PAGE_SIZE; > err = vmf_insert_pfn(vma, addr, pfn); > if (unlikely(err & VM_FAULT_ERROR)) >