diff mbox series

[06/12] cifs: Pass a pointer to virt_to_page() in cifsglob

Message ID	20230503-virt-to-pfn-v6-4-rc1-v1-6-6c4698dcf9c8@linaro.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Linus Walleij <linus.walleij@linaro.org> Date: Thu, 11 May 2023 13:59:23 +0200 Subject: [PATCH 06/12] cifs: Pass a pointer to virt_to_page() in cifsglob MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230503-virt-to-pfn-v6-4-rc1-v1-6-6c4698dcf9c8@linaro.org> References: <20230503-virt-to-pfn-v6-4-rc1-v1-0-6c4698dcf9c8@linaro.org> In-Reply-To: <20230503-virt-to-pfn-v6-4-rc1-v1-0-6c4698dcf9c8@linaro.org> To: Geert Uytterhoeven <geert@linux-m68k.org>, Vineet Gupta <vgupta@kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Arnd Bergmann <arnd@arndb.de>, Russell King <linux@armlinux.org.uk>, Greg Ungerer <gerg@linux-m68k.org> Cc: linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-snps-arc@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org> Precedence: bulk
Series	arch: Make virt_to_pfn into a static inline \| [00/12] arch: Make virt_to_pfn into a static inline [01/12] fs/proc/kcore.c: Pass a pointer to virt_addr_valid() [02/12] m68k: Pass a pointer to virt_to_pfn() virt_to_page() [03/12] ARC: init: Pass a pointer to virt_to_pfn() in init [04/12] riscv: mm: init: Pass a pointer to virt_to_page() [05/12] cifs: Pass a pointer to virt_to_page() [06/12] cifs: Pass a pointer to virt_to_page() in cifsglob [07/12] netfs: Pass a pointer to virt_to_page() [08/12] arm64: vdso: Pass (void *) to virt_to_page() [09/12] asm-generic/page.h: Make pfn accessors static inlines [10/12] ARM: mm: Make virt_to_pfn() a static inline [11/12] arm64: memory: Make virt_to_pfn() a static inline [12/12] m68k/mm: Make pfn accessors static inlines

Commit Message

Linus Walleij May 11, 2023, 11:59 a.m. UTC

  Like the other calls in this function virt_to_page() expects
a pointer, not an integer.

However since many architectures implement virt_to_pfn() as
a macro, this function becomes polymorphic and accepts both a
(unsigned long) and a (void *).

Fix this up with an explicit cast.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 fs/cifs/cifsglob.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Talpey May 17, 2023, 2:01 p.m. UTC | #1

On 5/11/2023 7:59 AM, Linus Walleij wrote:
> Like the other calls in this function virt_to_page() expects
> a pointer, not an integer.
> 
> However since many architectures implement virt_to_pfn() as
> a macro, this function becomes polymorphic and accepts both a
> (unsigned long) and a (void *).
> 
> Fix this up with an explicit cast.
> 
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>


For fs/cifs:

Acked-by: Tom Talpey <tom@talpey.com>

> ---
>   fs/cifs/cifsglob.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
> index 414685c5d530..3d29a4bbbc40 100644
> --- a/fs/cifs/cifsglob.h
> +++ b/fs/cifs/cifsglob.h
> @@ -2218,7 +2218,7 @@ static inline void cifs_sg_set_buf(struct sg_table *sgtable,
>   		} while (buflen);
>   	} else {
>   		sg_set_page(&sgtable->sgl[sgtable->nents++],
> -			    virt_to_page(addr), buflen, off);
> +			    virt_to_page((void *)addr), buflen, off);
>   	}
>   }
>   
>

diff mbox series

Patch

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 414685c5d530..3d29a4bbbc40 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -2218,7 +2218,7 @@  static inline void cifs_sg_set_buf(struct sg_table *sgtable,
 		} while (buflen);
 	} else {
 		sg_set_page(&sgtable->sgl[sgtable->nents++],
-			    virt_to_page(addr), buflen, off);
+			    virt_to_page((void *)addr), buflen, off);
 	}
 }