From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965752AbdAJPOg (ORCPT ); Tue, 10 Jan 2017 10:14:36 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:49233 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965588AbdAJPOb (ORCPT ); Tue, 10 Jan 2017 10:14:31 -0500 Subject: Re: linux-next: build failure after merge of the net-next tree To: Stephen Rothwell , David Miller , Networking , Al Viro References: <20170110105927.29edcec0@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Utz Bacher From: Ursula Braun Date: Tue, 10 Jan 2017 16:14:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170110105927.29edcec0@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17011015-0024-0000-0000-00000282BA9F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17011015-0025-0000-0000-000021E51253 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-01-10_12:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1701100220 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ACK - smc_splice_read() is just a place holder at the moment. Its implementation for AF_SMC will follow. Regards, Ursula Braun On 01/10/2017 12:59 AM, Stephen Rothwell wrote: > Hi all, > > After merging the net-next tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > net/smc/af_smc.c: In function 'smc_splice_read': > net/smc/af_smc.c:1258:39: error: passing argument 1 of 'smc->clcsock->ops->splice_read' from incompatible pointer type [-Werror=incompatible-pointer-types] > rc = smc->clcsock->ops->splice_read(smc->clcsock, ppos, > ^ > net/smc/af_smc.c:1258:39: note: expected 'struct file *' but argument is of type 'struct socket *' > net/smc/af_smc.c: At top level: > net/smc/af_smc.c:1288:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] > .splice_read = smc_splice_read, > ^ > net/smc/af_smc.c:1288:17: note: (near initialization for 'smc_sock_ops.splice_read') > > Caused by commit > > ac7138746e14 ("smc: establish new socket family") > > interacting with commit > > 15a8f657c71d ("switch socket ->splice_read() to struct file *") > > from the vfs tree. > > I applied the following merge fix patch which could well be incorrect ... > > From: Stephen Rothwell > Date: Tue, 10 Jan 2017 10:52:38 +1100 > Subject: [PATCH] smc: merge fix for "switch socket ->splice_read() to struct file *" > > Signed-off-by: Stephen Rothwell > --- > net/smc/af_smc.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c > index 5d4208ad029e..4875e65f0c4a 100644 > --- a/net/smc/af_smc.c > +++ b/net/smc/af_smc.c > @@ -1242,10 +1242,11 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page, > return rc; > } > > -static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos, > +static ssize_t smc_splice_read(struct file *file, loff_t *ppos, > struct pipe_inode_info *pipe, size_t len, > unsigned int flags) > { > + struct socket *sock = file->private_data; > struct sock *sk = sock->sk; > struct smc_sock *smc; > int rc = -ENOTCONN; > @@ -1255,7 +1256,7 @@ static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos, > if ((sk->sk_state != SMC_ACTIVE) && (sk->sk_state != SMC_CLOSED)) > goto out; > if (smc->use_fallback) { > - rc = smc->clcsock->ops->splice_read(smc->clcsock, ppos, > + rc = smc->clcsock->ops->splice_read(file, ppos, > pipe, len, flags); > } else { > rc = -EOPNOTSUPP; >