Re: linux-next: build failure after merge of the nfs tree
> On Jun 26, 2016, at 20:58, Stephen Rothwellwrote: > > Hi Trond, > > After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > fs/nfs/pnfs_nfs.c: In function 'pnfs_nfs_generic_sync': > fs/nfs/pnfs_nfs.c:947:8: error: too few arguments to function > 'nfs_commit_inode' > ret = nfs_commit_inode(inode); > ^ > In file included from fs/nfs/pnfs_nfs.c:10:0: > include/linux/nfs_fs.h:509:13: note: declared here > extern int nfs_commit_inode(struct inode *, int); >^ > > Caused by commit > > 292cc573fce6 ("pNFS: Files and flexfiles always need to commit before > layoutcommit") > > I have used the nsf tree from next-20160624 for today > Hi Stephen, My apologies: That was a last minute typo when amending a commit. I’ve fixed the code in today’s linux-next branch. Cheers Trond
Re: linux-next: build failure after merge of the nfs tree
> On Jun 26, 2016, at 20:58, Stephen Rothwell wrote: > > Hi Trond, > > After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > fs/nfs/pnfs_nfs.c: In function 'pnfs_nfs_generic_sync': > fs/nfs/pnfs_nfs.c:947:8: error: too few arguments to function > 'nfs_commit_inode' > ret = nfs_commit_inode(inode); > ^ > In file included from fs/nfs/pnfs_nfs.c:10:0: > include/linux/nfs_fs.h:509:13: note: declared here > extern int nfs_commit_inode(struct inode *, int); >^ > > Caused by commit > > 292cc573fce6 ("pNFS: Files and flexfiles always need to commit before > layoutcommit") > > I have used the nsf tree from next-20160624 for today > Hi Stephen, My apologies: That was a last minute typo when amending a commit. I’ve fixed the code in today’s linux-next branch. Cheers Trond
Re: linux-next: build failure after merge of the nfs tree
On 05/19/2016 08:06 AM, Trond Myklebust wrote: > Thanks Stephen! > > Anna will be managing pushing the NFS client changes to Linus during > this merge window, so I'm assuming she will include this and your > other fixup in her pull request. Yep! I'll make sure it's in there. Anna > > Cheers > Trond > > On Wed, May 18, 2016 at 8:58 PM, Stephen Rothwell> wrote: >> Hi Trond, >> >> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) >> failed like this: >> >> In file included from include/linux/fs.h:19:0, >> from fs/nfs/nfs42proc.c:4: >> fs/nfs/nfs42proc.c: In function 'nfs42_proc_copy': >> fs/nfs/nfs42proc.c:212:30: error: 'struct inode' has no member named >> 'i_mutex' >>mutex_lock(_inode(dst)->i_mutex); >> ^ >> include/linux/mutex.h:146:44: note: in definition of macro 'mutex_lock' >> #define mutex_lock(lock) mutex_lock_nested(lock, 0) >> ^ >> fs/nfs/nfs42proc.c:215:32: error: 'struct inode' has no member named >> 'i_mutex' >>mutex_unlock(_inode(dst)->i_mutex); >> ^ >> >> Caused by commit >> >> 2e72448b07dc ("NFS: Add COPY nfs operation") >> >> interacting with commit >> >> 9902af79c01a ("parallel lookups: actual switch to rwsem") >> >> from Linus' tree. >> >> I applied the following merge fix patch - you will need to send this to >> Linus when you ask him to merge your tree. >> >> From: Stephen Rothwell >> Date: Thu, 19 May 2016 10:50:26 +1000 >> Subject: [PATCH] nfs: fix for i_mutex to i_rwsem change >> >> Signed-off-by: Stephen Rothwell >> --- >> fs/nfs/nfs42proc.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c >> index 20c44d1209dc..aa03ed09ba06 100644 >> --- a/fs/nfs/nfs42proc.c >> +++ b/fs/nfs/nfs42proc.c >> @@ -209,10 +209,10 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t >> pos_src, >> dst_exception.state = dst_lock->open_context->state; >> >> do { >> - mutex_lock(_inode(dst)->i_mutex); >> + inode_lock(file_inode(dst)); >> err = _nfs42_proc_copy(src, pos_src, src_lock, >>dst, pos_dst, dst_lock, count); >> - mutex_unlock(_inode(dst)->i_mutex); >> + inode_unlock(file_inode(dst)); >> >> if (err == -ENOTSUPP) { >> err = -EOPNOTSUPP; >> -- >> 2.7.0 >> >> -- >> Cheers, >> Stephen Rothwell
Re: linux-next: build failure after merge of the nfs tree
On 05/19/2016 08:06 AM, Trond Myklebust wrote: > Thanks Stephen! > > Anna will be managing pushing the NFS client changes to Linus during > this merge window, so I'm assuming she will include this and your > other fixup in her pull request. Yep! I'll make sure it's in there. Anna > > Cheers > Trond > > On Wed, May 18, 2016 at 8:58 PM, Stephen Rothwell > wrote: >> Hi Trond, >> >> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) >> failed like this: >> >> In file included from include/linux/fs.h:19:0, >> from fs/nfs/nfs42proc.c:4: >> fs/nfs/nfs42proc.c: In function 'nfs42_proc_copy': >> fs/nfs/nfs42proc.c:212:30: error: 'struct inode' has no member named >> 'i_mutex' >>mutex_lock(_inode(dst)->i_mutex); >> ^ >> include/linux/mutex.h:146:44: note: in definition of macro 'mutex_lock' >> #define mutex_lock(lock) mutex_lock_nested(lock, 0) >> ^ >> fs/nfs/nfs42proc.c:215:32: error: 'struct inode' has no member named >> 'i_mutex' >>mutex_unlock(_inode(dst)->i_mutex); >> ^ >> >> Caused by commit >> >> 2e72448b07dc ("NFS: Add COPY nfs operation") >> >> interacting with commit >> >> 9902af79c01a ("parallel lookups: actual switch to rwsem") >> >> from Linus' tree. >> >> I applied the following merge fix patch - you will need to send this to >> Linus when you ask him to merge your tree. >> >> From: Stephen Rothwell >> Date: Thu, 19 May 2016 10:50:26 +1000 >> Subject: [PATCH] nfs: fix for i_mutex to i_rwsem change >> >> Signed-off-by: Stephen Rothwell >> --- >> fs/nfs/nfs42proc.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c >> index 20c44d1209dc..aa03ed09ba06 100644 >> --- a/fs/nfs/nfs42proc.c >> +++ b/fs/nfs/nfs42proc.c >> @@ -209,10 +209,10 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t >> pos_src, >> dst_exception.state = dst_lock->open_context->state; >> >> do { >> - mutex_lock(_inode(dst)->i_mutex); >> + inode_lock(file_inode(dst)); >> err = _nfs42_proc_copy(src, pos_src, src_lock, >>dst, pos_dst, dst_lock, count); >> - mutex_unlock(_inode(dst)->i_mutex); >> + inode_unlock(file_inode(dst)); >> >> if (err == -ENOTSUPP) { >> err = -EOPNOTSUPP; >> -- >> 2.7.0 >> >> -- >> Cheers, >> Stephen Rothwell
Re: linux-next: build failure after merge of the nfs tree
Thanks Stephen! Anna will be managing pushing the NFS client changes to Linus during this merge window, so I'm assuming she will include this and your other fixup in her pull request. Cheers Trond On Wed, May 18, 2016 at 8:58 PM, Stephen Rothwellwrote: > Hi Trond, > > After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > In file included from include/linux/fs.h:19:0, > from fs/nfs/nfs42proc.c:4: > fs/nfs/nfs42proc.c: In function 'nfs42_proc_copy': > fs/nfs/nfs42proc.c:212:30: error: 'struct inode' has no member named 'i_mutex' >mutex_lock(_inode(dst)->i_mutex); > ^ > include/linux/mutex.h:146:44: note: in definition of macro 'mutex_lock' > #define mutex_lock(lock) mutex_lock_nested(lock, 0) > ^ > fs/nfs/nfs42proc.c:215:32: error: 'struct inode' has no member named 'i_mutex' >mutex_unlock(_inode(dst)->i_mutex); > ^ > > Caused by commit > > 2e72448b07dc ("NFS: Add COPY nfs operation") > > interacting with commit > > 9902af79c01a ("parallel lookups: actual switch to rwsem") > > from Linus' tree. > > I applied the following merge fix patch - you will need to send this to > Linus when you ask him to merge your tree. > > From: Stephen Rothwell > Date: Thu, 19 May 2016 10:50:26 +1000 > Subject: [PATCH] nfs: fix for i_mutex to i_rwsem change > > Signed-off-by: Stephen Rothwell > --- > fs/nfs/nfs42proc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c > index 20c44d1209dc..aa03ed09ba06 100644 > --- a/fs/nfs/nfs42proc.c > +++ b/fs/nfs/nfs42proc.c > @@ -209,10 +209,10 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t > pos_src, > dst_exception.state = dst_lock->open_context->state; > > do { > - mutex_lock(_inode(dst)->i_mutex); > + inode_lock(file_inode(dst)); > err = _nfs42_proc_copy(src, pos_src, src_lock, >dst, pos_dst, dst_lock, count); > - mutex_unlock(_inode(dst)->i_mutex); > + inode_unlock(file_inode(dst)); > > if (err == -ENOTSUPP) { > err = -EOPNOTSUPP; > -- > 2.7.0 > > -- > Cheers, > Stephen Rothwell
Re: linux-next: build failure after merge of the nfs tree
Thanks Stephen! Anna will be managing pushing the NFS client changes to Linus during this merge window, so I'm assuming she will include this and your other fixup in her pull request. Cheers Trond On Wed, May 18, 2016 at 8:58 PM, Stephen Rothwell wrote: > Hi Trond, > > After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > In file included from include/linux/fs.h:19:0, > from fs/nfs/nfs42proc.c:4: > fs/nfs/nfs42proc.c: In function 'nfs42_proc_copy': > fs/nfs/nfs42proc.c:212:30: error: 'struct inode' has no member named 'i_mutex' >mutex_lock(_inode(dst)->i_mutex); > ^ > include/linux/mutex.h:146:44: note: in definition of macro 'mutex_lock' > #define mutex_lock(lock) mutex_lock_nested(lock, 0) > ^ > fs/nfs/nfs42proc.c:215:32: error: 'struct inode' has no member named 'i_mutex' >mutex_unlock(_inode(dst)->i_mutex); > ^ > > Caused by commit > > 2e72448b07dc ("NFS: Add COPY nfs operation") > > interacting with commit > > 9902af79c01a ("parallel lookups: actual switch to rwsem") > > from Linus' tree. > > I applied the following merge fix patch - you will need to send this to > Linus when you ask him to merge your tree. > > From: Stephen Rothwell > Date: Thu, 19 May 2016 10:50:26 +1000 > Subject: [PATCH] nfs: fix for i_mutex to i_rwsem change > > Signed-off-by: Stephen Rothwell > --- > fs/nfs/nfs42proc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c > index 20c44d1209dc..aa03ed09ba06 100644 > --- a/fs/nfs/nfs42proc.c > +++ b/fs/nfs/nfs42proc.c > @@ -209,10 +209,10 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t > pos_src, > dst_exception.state = dst_lock->open_context->state; > > do { > - mutex_lock(_inode(dst)->i_mutex); > + inode_lock(file_inode(dst)); > err = _nfs42_proc_copy(src, pos_src, src_lock, >dst, pos_dst, dst_lock, count); > - mutex_unlock(_inode(dst)->i_mutex); > + inode_unlock(file_inode(dst)); > > if (err == -ENOTSUPP) { > err = -EOPNOTSUPP; > -- > 2.7.0 > > -- > Cheers, > Stephen Rothwell
Re: linux-next: build failure after merge of the nfs tree
Hello! On Aug 24, 2015, at 10:17 AM, Trond Myklebust wrote: > Hi Stephen, > > On Sun, Aug 23, 2015 at 7:16 PM, Stephen Rothwell > wrote: >> Hi Trond, >> >> On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell >> wrote: >>> >>> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) >>> failed like this: >>> >>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function >>> 'kiblnd_pmr_pool_map': >>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit >>> declaration of function 'ib_reg_phys_mr' >>> [-Werror=implicit-function-declaration] >>> pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, >>> ^ >>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: >>> assignment makes pointer from integer without a cast >>> pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, >>> ^ >>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function >>> 'kiblnd_hdev_setup_mrs': >>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: >>> assignment makes pointer from integer without a cast >>> mr = ib_reg_phys_mr(hdev->ibh_pd, , 1, acflags, ); >>> ^ >>> >>> Caused by commit >>> >>> 1241d7bf2ac8 ("core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() >>> verbs") >>> >>> which noted this build failure would occur :-( >>> >>> Since this commit is self comtained, I have reverted it until someone >>> provides a fix for the lustre code. >> >> Any chance of you including the below patch into the nfs tree to fix >> the allmodfig build? Currently, I have to disable lustre in the nfs >> tree merge and then reenable it in the staging tree merge - which shows >> that this patch (which is also in the staging tree) fixes the build >> problem. Without this patch (or a patch that disables lustre), if the >> nfs tree is merged by Linus before the staging tree, his allmodconfig >> build will break. >> >> (Greg's SOB line is there because he has also included this patch in >> the staging tree.) > > If Oleg is OK with this, then I can certainly try. I am sure fine with that. Thanks Bye, Oleg-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the nfs tree
Hi Stephen, On Sun, Aug 23, 2015 at 7:16 PM, Stephen Rothwell wrote: > Hi Trond, > > On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell > wrote: >> >> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) >> failed like this: >> >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function >> 'kiblnd_pmr_pool_map': >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit >> declaration of function 'ib_reg_phys_mr' >> [-Werror=implicit-function-declaration] >> pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, >> ^ >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: >> assignment makes pointer from integer without a cast >> pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, >> ^ >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function >> 'kiblnd_hdev_setup_mrs': >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: >> assignment makes pointer from integer without a cast >>mr = ib_reg_phys_mr(hdev->ibh_pd, , 1, acflags, ); >> ^ >> >> Caused by commit >> >> 1241d7bf2ac8 ("core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() >> verbs") >> >> which noted this build failure would occur :-( >> >> Since this commit is self comtained, I have reverted it until someone >> provides a fix for the lustre code. > > Any chance of you including the below patch into the nfs tree to fix > the allmodfig build? Currently, I have to disable lustre in the nfs > tree merge and then reenable it in the staging tree merge - which shows > that this patch (which is also in the staging tree) fixes the build > problem. Without this patch (or a patch that disables lustre), if the > nfs tree is merged by Linus before the staging tree, his allmodconfig > build will break. > > (Greg's SOB line is there because he has also included this patch in > the staging tree.) If Oleg is OK with this, then I can certainly try. Cheers Trond -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the nfs tree
Hello! On Aug 24, 2015, at 10:17 AM, Trond Myklebust wrote: Hi Stephen, On Sun, Aug 23, 2015 at 7:16 PM, Stephen Rothwell s...@canb.auug.org.au wrote: Hi Trond, On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_pmr_pool_map': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit declaration of function 'ib_reg_phys_mr' [-Werror=implicit-function-declaration] pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: assignment makes pointer from integer without a cast pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: assignment makes pointer from integer without a cast mr = ib_reg_phys_mr(hdev-ibh_pd, ipb, 1, acflags, iova); ^ Caused by commit 1241d7bf2ac8 (core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() verbs) which noted this build failure would occur :-( Since this commit is self comtained, I have reverted it until someone provides a fix for the lustre code. Any chance of you including the below patch into the nfs tree to fix the allmodfig build? Currently, I have to disable lustre in the nfs tree merge and then reenable it in the staging tree merge - which shows that this patch (which is also in the staging tree) fixes the build problem. Without this patch (or a patch that disables lustre), if the nfs tree is merged by Linus before the staging tree, his allmodconfig build will break. (Greg's SOB line is there because he has also included this patch in the staging tree.) If Oleg is OK with this, then I can certainly try. I am sure fine with that. Thanks Bye, Oleg-- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the nfs tree
Hi Stephen, On Sun, Aug 23, 2015 at 7:16 PM, Stephen Rothwell s...@canb.auug.org.au wrote: Hi Trond, On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_pmr_pool_map': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit declaration of function 'ib_reg_phys_mr' [-Werror=implicit-function-declaration] pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: assignment makes pointer from integer without a cast pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: assignment makes pointer from integer without a cast mr = ib_reg_phys_mr(hdev-ibh_pd, ipb, 1, acflags, iova); ^ Caused by commit 1241d7bf2ac8 (core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() verbs) which noted this build failure would occur :-( Since this commit is self comtained, I have reverted it until someone provides a fix for the lustre code. Any chance of you including the below patch into the nfs tree to fix the allmodfig build? Currently, I have to disable lustre in the nfs tree merge and then reenable it in the staging tree merge - which shows that this patch (which is also in the staging tree) fixes the build problem. Without this patch (or a patch that disables lustre), if the nfs tree is merged by Linus before the staging tree, his allmodconfig build will break. (Greg's SOB line is there because he has also included this patch in the staging tree.) If Oleg is OK with this, then I can certainly try. Cheers Trond -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the nfs tree
Hi Trond, On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell wrote: > > After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function > 'kiblnd_pmr_pool_map': > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit > declaration of function 'ib_reg_phys_mr' > [-Werror=implicit-function-declaration] > pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, > ^ > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: > assignment makes pointer from integer without a cast > pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, > ^ > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function > 'kiblnd_hdev_setup_mrs': > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: > assignment makes pointer from integer without a cast >mr = ib_reg_phys_mr(hdev->ibh_pd, , 1, acflags, ); > ^ > > Caused by commit > > 1241d7bf2ac8 ("core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() > verbs") > > which noted this build failure would occur :-( > > Since this commit is self comtained, I have reverted it until someone > provides a fix for the lustre code. Any chance of you including the below patch into the nfs tree to fix the allmodfig build? Currently, I have to disable lustre in the nfs tree merge and then reenable it in the staging tree merge - which shows that this patch (which is also in the staging tree) fixes the build problem. Without this patch (or a patch that disables lustre), if the nfs tree is merged by Linus before the staging tree, his allmodconfig build will break. (Greg's SOB line is there because he has also included this patch in the staging tree.) From: Oleg Drokin Date: Tue, 18 Aug 2015 21:04:35 -0400 Subject: staging/lustre/o2iblnd: remove references to ib_reg_phsy_mr() Removed references to ib_reg_phsy_mr() and PMR which was added to deal with some Chelsio specific scenario, but no longer needed now. Reported-by: Stephen Rothwell Signed-off-by: Amir Shehata Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c| 251 + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h| 32 +-- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 55 + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 6 - 4 files changed, 19 insertions(+), 325 deletions(-) diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c index 24b2c978dfb6..c29d2ced258c 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c @@ -1789,140 +1789,6 @@ struct list_head *kiblnd_pool_alloc_node(kib_poolset_t *ps) goto again; } -void kiblnd_pmr_pool_unmap(kib_phys_mr_t *pmr) -{ - kib_pmr_pool_t *ppo = pmr->pmr_pool; - struct ib_mr *mr = pmr->pmr_mr; - - pmr->pmr_mr = NULL; - kiblnd_pool_free_node(>ppo_pool, >pmr_list); - if (mr != NULL) - ib_dereg_mr(mr); -} - -int kiblnd_pmr_pool_map(kib_pmr_poolset_t *pps, kib_hca_dev_t *hdev, - kib_rdma_desc_t *rd, __u64 *iova, kib_phys_mr_t **pp_pmr) -{ - kib_phys_mr_t *pmr; - struct list_head *node; - int rc; - int i; - - node = kiblnd_pool_alloc_node(>pps_poolset); - if (node == NULL) { - CERROR("Failed to allocate PMR descriptor\n"); - return -ENOMEM; - } - - pmr = container_of(node, kib_phys_mr_t, pmr_list); - if (pmr->pmr_pool->ppo_hdev != hdev) { - kiblnd_pool_free_node(>pmr_pool->ppo_pool, node); - return -EAGAIN; - } - - for (i = 0; i < rd->rd_nfrags; i++) { - pmr->pmr_ipb[i].addr = rd->rd_frags[i].rf_addr; - pmr->pmr_ipb[i].size = rd->rd_frags[i].rf_nob; - } - - pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, -pmr->pmr_ipb, rd->rd_nfrags, -IB_ACCESS_LOCAL_WRITE | -IB_ACCESS_REMOTE_WRITE, -iova); - if (!IS_ERR(pmr->pmr_mr)) { - pmr->pmr_iova = *iova; - *pp_pmr = pmr; - return 0; - } - - rc = PTR_ERR(pmr->pmr_mr); - CERROR("Failed ib_reg_phys_mr: %d\n", rc); - - pmr->pmr_mr = NULL; - kiblnd_pool_free_node(>pmr_pool->ppo_pool, node); - - return rc; -} - -static void kiblnd_destroy_pmr_pool(kib_pool_t *pool) -{ - kib_pmr_pool_t *ppo = container_of(pool, kib_pmr_pool_t, ppo_pool); - kib_phys_mr_t *pmr; - kib_phys_mr_t *tmp; - - LASSERT(pool->po_allocated == 0); - - list_for_each_entry_safe(pmr, tmp, >po_free_list, pmr_list) { - LASSERT(pmr->pmr_mr == NULL); - list_del(>pmr_list);
Re: linux-next: build failure after merge of the nfs tree
Hi Trond, On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_pmr_pool_map': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit declaration of function 'ib_reg_phys_mr' [-Werror=implicit-function-declaration] pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: assignment makes pointer from integer without a cast pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: assignment makes pointer from integer without a cast mr = ib_reg_phys_mr(hdev-ibh_pd, ipb, 1, acflags, iova); ^ Caused by commit 1241d7bf2ac8 (core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() verbs) which noted this build failure would occur :-( Since this commit is self comtained, I have reverted it until someone provides a fix for the lustre code. Any chance of you including the below patch into the nfs tree to fix the allmodfig build? Currently, I have to disable lustre in the nfs tree merge and then reenable it in the staging tree merge - which shows that this patch (which is also in the staging tree) fixes the build problem. Without this patch (or a patch that disables lustre), if the nfs tree is merged by Linus before the staging tree, his allmodconfig build will break. (Greg's SOB line is there because he has also included this patch in the staging tree.) From: Oleg Drokin gr...@linuxhacker.ru Date: Tue, 18 Aug 2015 21:04:35 -0400 Subject: staging/lustre/o2iblnd: remove references to ib_reg_phsy_mr() Removed references to ib_reg_phsy_mr() and PMR which was added to deal with some Chelsio specific scenario, but no longer needed now. Reported-by: Stephen Rothwell s...@canb.auug.org.au Signed-off-by: Amir Shehata amir.sheh...@intel.com Signed-off-by: Oleg Drokin oleg.dro...@intel.com Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org --- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c| 251 + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h| 32 +-- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 55 + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 6 - 4 files changed, 19 insertions(+), 325 deletions(-) diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c index 24b2c978dfb6..c29d2ced258c 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c @@ -1789,140 +1789,6 @@ struct list_head *kiblnd_pool_alloc_node(kib_poolset_t *ps) goto again; } -void kiblnd_pmr_pool_unmap(kib_phys_mr_t *pmr) -{ - kib_pmr_pool_t *ppo = pmr-pmr_pool; - struct ib_mr *mr = pmr-pmr_mr; - - pmr-pmr_mr = NULL; - kiblnd_pool_free_node(ppo-ppo_pool, pmr-pmr_list); - if (mr != NULL) - ib_dereg_mr(mr); -} - -int kiblnd_pmr_pool_map(kib_pmr_poolset_t *pps, kib_hca_dev_t *hdev, - kib_rdma_desc_t *rd, __u64 *iova, kib_phys_mr_t **pp_pmr) -{ - kib_phys_mr_t *pmr; - struct list_head *node; - int rc; - int i; - - node = kiblnd_pool_alloc_node(pps-pps_poolset); - if (node == NULL) { - CERROR(Failed to allocate PMR descriptor\n); - return -ENOMEM; - } - - pmr = container_of(node, kib_phys_mr_t, pmr_list); - if (pmr-pmr_pool-ppo_hdev != hdev) { - kiblnd_pool_free_node(pmr-pmr_pool-ppo_pool, node); - return -EAGAIN; - } - - for (i = 0; i rd-rd_nfrags; i++) { - pmr-pmr_ipb[i].addr = rd-rd_frags[i].rf_addr; - pmr-pmr_ipb[i].size = rd-rd_frags[i].rf_nob; - } - - pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, -pmr-pmr_ipb, rd-rd_nfrags, -IB_ACCESS_LOCAL_WRITE | -IB_ACCESS_REMOTE_WRITE, -iova); - if (!IS_ERR(pmr-pmr_mr)) { - pmr-pmr_iova = *iova; - *pp_pmr = pmr; - return 0; - } - - rc = PTR_ERR(pmr-pmr_mr); - CERROR(Failed ib_reg_phys_mr: %d\n, rc); - - pmr-pmr_mr = NULL; - kiblnd_pool_free_node(pmr-pmr_pool-ppo_pool, node); - - return rc; -} - -static void kiblnd_destroy_pmr_pool(kib_pool_t *pool) -{ - kib_pmr_pool_t *ppo = container_of(pool, kib_pmr_pool_t, ppo_pool); - kib_phys_mr_t *pmr; - kib_phys_mr_t *tmp; - - LASSERT(pool-po_allocated == 0); - - list_for_each_entry_safe(pmr, tmp, pool-po_free_list,
Re: linux-next: build failure after merge of the nfs tree
Hello! On Aug 18, 2015, at 8:05 PM, Stephen Rothwell wrote: > Hi Trond, > > On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell > wrote: >> >> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) >> failed like this: >> >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function >> 'kiblnd_pmr_pool_map': >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit >> declaration of function 'ib_reg_phys_mr' >> [-Werror=implicit-function-declaration] >> pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, >> ^ >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: >> assignment makes pointer from integer without a cast >> pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, >> ^ >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function >> 'kiblnd_hdev_setup_mrs': >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: >> assignment makes pointer from integer without a cast >> mr = ib_reg_phys_mr(hdev->ibh_pd, , 1, acflags, ); >> ^ >> >> Caused by commit >> >> 1241d7bf2ac8 ("core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() >> verbs") >> >> which noted this build failure would occur :-( >> >> Since this commit is self comtained, I have reverted it until someone >> provides a fix for the lustre code. > > Today, I will disable lustre (from staging) instead (thanks to > Christoph for reminding me of this policy). We have a patch for that, actually. I'll try to build it against your tree and submit it afterwards (will take a bit of time). Bye, Oleg-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the nfs tree
Hi Trond, On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell wrote: > > After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function > 'kiblnd_pmr_pool_map': > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit > declaration of function 'ib_reg_phys_mr' > [-Werror=implicit-function-declaration] > pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, > ^ > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: > assignment makes pointer from integer without a cast > pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd, > ^ > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function > 'kiblnd_hdev_setup_mrs': > drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: > assignment makes pointer from integer without a cast >mr = ib_reg_phys_mr(hdev->ibh_pd, , 1, acflags, ); > ^ > > Caused by commit > > 1241d7bf2ac8 ("core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() > verbs") > > which noted this build failure would occur :-( > > Since this commit is self comtained, I have reverted it until someone > provides a fix for the lustre code. Today, I will disable lustre (from staging) instead (thanks to Christoph for reminding me of this policy). -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the nfs tree
Hi Trond, On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_pmr_pool_map': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit declaration of function 'ib_reg_phys_mr' [-Werror=implicit-function-declaration] pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: assignment makes pointer from integer without a cast pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: assignment makes pointer from integer without a cast mr = ib_reg_phys_mr(hdev-ibh_pd, ipb, 1, acflags, iova); ^ Caused by commit 1241d7bf2ac8 (core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() verbs) which noted this build failure would occur :-( Since this commit is self comtained, I have reverted it until someone provides a fix for the lustre code. Today, I will disable lustre (from staging) instead (thanks to Christoph for reminding me of this policy). -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the nfs tree
Hello! On Aug 18, 2015, at 8:05 PM, Stephen Rothwell wrote: Hi Trond, On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: After merging the nfs tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_pmr_pool_map': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit declaration of function 'ib_reg_phys_mr' [-Werror=implicit-function-declaration] pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: assignment makes pointer from integer without a cast pmr-pmr_mr = ib_reg_phys_mr(hdev-ibh_pd, ^ drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: assignment makes pointer from integer without a cast mr = ib_reg_phys_mr(hdev-ibh_pd, ipb, 1, acflags, iova); ^ Caused by commit 1241d7bf2ac8 (core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() verbs) which noted this build failure would occur :-( Since this commit is self comtained, I have reverted it until someone provides a fix for the lustre code. Today, I will disable lustre (from staging) instead (thanks to Christoph for reminding me of this policy). We have a patch for that, actually. I'll try to build it against your tree and submit it afterwards (will take a bit of time). Bye, Oleg-- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the nfs tree
Thanks Stephen! Trond, can you just pick up the patch? Considered it: Reviewed-by: Christoph Hellwig On Mon, Sep 15, 2014 at 05:04:53PM +1000, Stephen Rothwell wrote: > Hi Trond, > > After merging the nfs tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > fs/nfs/blocklayout/extent_tree.c: In function 'ext_tree_prepare_commit': > fs/nfs/blocklayout/extent_tree.c:540:3: error: implicit declaration of > function '__vmalloc' [-Werror=implicit-function-declaration] >start_p = __vmalloc(buffer_size, GFP_NOFS, PAGE_KERNEL); >^ > fs/nfs/blocklayout/extent_tree.c:540:11: warning: assignment makes pointer > from integer without a cast >start_p = __vmalloc(buffer_size, GFP_NOFS, PAGE_KERNEL); >^ > > Caused by commit 34dc93c2fc04 ("pnfs/blocklayout: allocate separate > pages for the layoutcommit payload"). > > I added the following fix patch for today: > > From: Stephen Rothwell > Date: Mon, 15 Sep 2014 17:01:32 +1000 > Subject: [PATCH] pnfs/blocklayout: include vmalloc.h for __vmalloc > > Signed-off-by: Stephen Rothwell > --- > fs/nfs/blocklayout/extent_tree.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/fs/nfs/blocklayout/extent_tree.c > b/fs/nfs/blocklayout/extent_tree.c > index 93193616205a..31d0b5e53dfd 100644 > --- a/fs/nfs/blocklayout/extent_tree.c > +++ b/fs/nfs/blocklayout/extent_tree.c > @@ -2,6 +2,8 @@ > * Copyright (c) 2014 Christoph Hellwig. > */ > > +#include > + > #include "blocklayout.h" > > #define NFSDBG_FACILITY NFSDBG_PNFS_LD > -- > 2.1.0 > > -- > Cheers, > Stephen Rothwells...@canb.auug.org.au ---end quoted text--- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the nfs tree
Thanks Stephen! Trond, can you just pick up the patch? Considered it: Reviewed-by: Christoph Hellwig h...@lst.de On Mon, Sep 15, 2014 at 05:04:53PM +1000, Stephen Rothwell wrote: Hi Trond, After merging the nfs tree, today's linux-next build (powerpc allyesconfig) failed like this: fs/nfs/blocklayout/extent_tree.c: In function 'ext_tree_prepare_commit': fs/nfs/blocklayout/extent_tree.c:540:3: error: implicit declaration of function '__vmalloc' [-Werror=implicit-function-declaration] start_p = __vmalloc(buffer_size, GFP_NOFS, PAGE_KERNEL); ^ fs/nfs/blocklayout/extent_tree.c:540:11: warning: assignment makes pointer from integer without a cast start_p = __vmalloc(buffer_size, GFP_NOFS, PAGE_KERNEL); ^ Caused by commit 34dc93c2fc04 (pnfs/blocklayout: allocate separate pages for the layoutcommit payload). I added the following fix patch for today: From: Stephen Rothwell s...@canb.auug.org.au Date: Mon, 15 Sep 2014 17:01:32 +1000 Subject: [PATCH] pnfs/blocklayout: include vmalloc.h for __vmalloc Signed-off-by: Stephen Rothwell s...@canb.auug.org.au --- fs/nfs/blocklayout/extent_tree.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfs/blocklayout/extent_tree.c b/fs/nfs/blocklayout/extent_tree.c index 93193616205a..31d0b5e53dfd 100644 --- a/fs/nfs/blocklayout/extent_tree.c +++ b/fs/nfs/blocklayout/extent_tree.c @@ -2,6 +2,8 @@ * Copyright (c) 2014 Christoph Hellwig. */ +#include linux/vmalloc.h + #include blocklayout.h #define NFSDBG_FACILITY NFSDBG_PNFS_LD -- 2.1.0 -- Cheers, Stephen Rothwells...@canb.auug.org.au ---end quoted text--- -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: build failure after merge of the nfs tree
> -Original Message- > From: linux-kernel-ow...@vger.kernel.org [mailto:linux-kernel- > ow...@vger.kernel.org] On Behalf Of Stephen Rothwell > Sent: Monday, October 01, 2012 8:39 PM > To: Trond Myklebust > Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: linux-next: build failure after merge of the nfs tree > > Hi Trond, > > After merging the nfs tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > fs/nfs/callback.c: In function 'nfs_minorversion_callback_svc_setup': > fs/nfs/callback.c:206:21: error: 'ENOTSUP' undeclared (first use in this > function) > > Caused by commit 141e1f553b6e ("NFSv4: Fix the minor version callback > channel startup"). > Hi Stephen, Thanks! We've already fixed this issue and pushed out a new tree... Cheers Trond -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: build failure after merge of the nfs tree
-Original Message- From: linux-kernel-ow...@vger.kernel.org [mailto:linux-kernel- ow...@vger.kernel.org] On Behalf Of Stephen Rothwell Sent: Monday, October 01, 2012 8:39 PM To: Trond Myklebust Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org Subject: linux-next: build failure after merge of the nfs tree Hi Trond, After merging the nfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/nfs/callback.c: In function 'nfs_minorversion_callback_svc_setup': fs/nfs/callback.c:206:21: error: 'ENOTSUP' undeclared (first use in this function) Caused by commit 141e1f553b6e (NFSv4: Fix the minor version callback channel startup). Hi Stephen, Thanks! We've already fixed this issue and pushed out a new tree... Cheers Trond -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/