linux-next: build failure after merge of the nfs tree

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 956 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/nfs/write.c: In function 'nfs_flush_multi':
fs/nfs/write.c:942: error: too many arguments to function 'pnfs_update_layout'
fs/nfs/write.c: In function 'nfs_flush_one':
fs/nfs/write.c:1016: error: too many arguments to function 'pnfs_update_layout'
fs/nfs/read.c: In function 'nfs_pagein_multi':
fs/nfs/read.c:291: error: too many arguments to function 'pnfs_update_layout'
fs/nfs/read.c: In function 'nfs_pagein_one':
fs/nfs/read.c:354: error: too many arguments to function 'pnfs_update_layout'

Cased by commit 4b386a0fe47b ("NFSv4.1: Ensure that layoutget uses the
correct gfp modes") which forgot to update the function declaration for
the !CONFIG_NFS_V4_1 case.

I have used the nfs tree from next-20110511 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@au.ibm.com
IBM OzLabs Linux Technology Centre

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the nfs tree

[Trond Myklebust]

On Thu, 2011-05-12 at 11:12 +1000, Stephen Rothwell wrote:
> Hi Trond,
> 
> After merging the nfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/nfs/write.c: In function 'nfs_flush_multi':
> fs/nfs/write.c:942: error: too many arguments to function 'pnfs_update_layout'
> fs/nfs/write.c: In function 'nfs_flush_one':
> fs/nfs/write.c:1016: error: too many arguments to function 'pnfs_update_layout'
> fs/nfs/read.c: In function 'nfs_pagein_multi':
> fs/nfs/read.c:291: error: too many arguments to function 'pnfs_update_layout'
> fs/nfs/read.c: In function 'nfs_pagein_one':
> fs/nfs/read.c:354: error: too many arguments to function 'pnfs_update_layout'
> 
> Cased by commit 4b386a0fe47b ("NFSv4.1: Ensure that layoutget uses the
> correct gfp modes") which forgot to update the function declaration for
> the !CONFIG_NFS_V4_1 case.
> 
> I have used the nfs tree from next-20110511 for today.

Hi Stephen,

Sorry about that. I thought I had found all occurrences and updated
them. The above issue should now be fixed in the git tree...

Cheers
  Trond

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 625 bytes --]

Hi all,

After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

fs/nfs/inode.c: In function 'nfs_net_init':
fs/nfs/inode.c:2434:13: error: assignment to 'int' from 'struct proc_dir_entry *' makes integer from pointer without a cast [-Werror=int-conversion]
 2434 |         err = rpc_proc_register(net, &nn->rpcstats);
      |             ^
cc1: all warnings being treated as errors

Caused by commit

  f290a586e31f ("nfs: Handle error of rpc_proc_register() in nfs_net_init().")

I have used the nfs tree from next-20240404 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the nfs tree

[Kuniyuki Iwashima]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 5 Apr 2024 09:53:41 +1100
> Hi all,
> 
> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> fs/nfs/inode.c: In function 'nfs_net_init':
> fs/nfs/inode.c:2434:13: error: assignment to 'int' from 'struct proc_dir_entry *' makes integer from pointer without a cast [-Werror=int-conversion]
>  2434 |         err = rpc_proc_register(net, &nn->rpcstats);
>       |             ^
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   f290a586e31f ("nfs: Handle error of rpc_proc_register() in nfs_net_init().")
> 
> I have used the nfs tree from next-20240404 for today.

Sorry, I posted v2 of the patch.
https://lore.kernel.org/linux-nfs/20240404221200.52876-1-kuniyu@amazon.com/

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

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

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the nfs tree

[Trond Myklebust]

> On Jun 26, 2016, at 20:58, Stephen Rothwell <sfr@canb.auug.org.au> 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

[Trond Myklebust]

> On Jun 26, 2016, at 20:58, Stephen Rothwell <sfr@canb.auug.org.au> 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--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

Hi Trond,

After merging the nfs tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

fs/nfs/direct.c: In function 'nfs_direct_write_reschedule':
fs/nfs/direct.c:652:32: error: 'struct pnfs_ds_commit_info' has no member named 'nbuckets'
  for (i = 0; i < dreq->ds_cinfo.nbuckets; i++)
                                ^
fs/nfs/direct.c:653:17: error: 'struct pnfs_ds_commit_info' has no member named 'buckets'
   dreq->ds_cinfo.buckets[i].direct_verf.committed = NFS_INVALID_STABLE_HOW;
                 ^

Caused by commit

  2f9273fd2f09 ("NFS: Ensure we reset the write verifier 'committed' value on resend.")

CONFIG_NFS_V4_1 is not set for this build.

I have used the nfs tree from next-20160609 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

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(&file_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(&file_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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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(&file_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(&file_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

[Trond Myklebust]

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 <sfr@canb.auug.org.au> 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(&file_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(&file_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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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(&file_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(&file_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

[Anna Schumaker]

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 <sfr@canb.auug.org.au> 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(&file_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(&file_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 <sfr@canb.auug.org.au>
>> 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 <sfr@canb.auug.org.au>
>> ---
>>  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(&file_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(&file_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

[Anna Schumaker]

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 <sfr@canb.auug.org.au> 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(&file_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(&file_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 <sfr@canb.auug.org.au>
>> 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 <sfr@canb.auug.org.au>
>> ---
>>  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(&file_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(&file_inode(dst)->i_mutex);
>> +               inode_unlock(file_inode(dst));
>>
>>                 if (err == -ENOTSUPP) {
>>                         err = -EOPNOTSUPP;
>> --
>> 2.7.0
>>
>> --
>> Cheers,
>> Stephen Rothwell

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

Hi Trond,

After merging the nfs tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

write.c:(.text+0xa60): multiple definition of `nfs_wait_atomic_killable'
fs/nfs/inode.o:inode.c:(.text+0x20a4): first defined here

Caused by commit

  fa5cca9f3334 ("NFS: Use wait_on_atomic_t() for unlock after readahead")

I have used the nfs tree from next-20160107 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the nfs tree

[Trond Myklebust]

Hi Stephen,

On Thu, Jan 7, 2016 at 7:14 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Trond,
>
> After merging the nfs tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> write.c:(.text+0xa60): multiple definition of `nfs_wait_atomic_killable'
> fs/nfs/inode.o:inode.c:(.text+0x20a4): first defined here
>
> Caused by commit
>
>   fa5cca9f3334 ("NFS: Use wait_on_atomic_t() for unlock after readahead")
>
> I have used the nfs tree from next-20160107 for today.
>

I just finished fixing that up. :-) Apologies for not catching it
earlier. It was an integration issue in my own tree.

Cheers
  Trond

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

Hi Trond,

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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

Hi Trond,

On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell <sfr@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 Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

Hi Trond,

On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell <sfr@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 Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the nfs tree

[Drokin, Oleg]

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 <sfr@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

Re: linux-next: build failure after merge of the nfs tree

[Drokin, Oleg]

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 <sfr@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

Re: linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

Hi Trond,

On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell <sfr@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 <green@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 <sfr@canb.auug.org.au>
Signed-off-by: Amir Shehata <amir.shehata@intel.com>
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@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, pmr_list) {
-		LASSERT(pmr->pmr_mr == NULL);
-		list_del(&pmr->pmr_list);
-
-		if (pmr->pmr_ipb != NULL) {
-			LIBCFS_FREE(pmr->pmr_ipb,
-				    IBLND_MAX_RDMA_FRAGS *
-				    sizeof(struct ib_phys_buf));
-		}
-
-		LIBCFS_FREE(pmr, sizeof(kib_phys_mr_t));
-	}
-
-	kiblnd_fini_pool(pool);
-	if (ppo->ppo_hdev != NULL)
-		kiblnd_hdev_decref(ppo->ppo_hdev);
-
-	LIBCFS_FREE(ppo, sizeof(kib_pmr_pool_t));
-}
-
-static inline int kiblnd_pmr_pool_size(int ncpts)
-{
-	int size = *kiblnd_tunables.kib_pmr_pool_size / ncpts;
-
-	return max(IBLND_PMR_POOL, size);
-}
-
-static int kiblnd_create_pmr_pool(kib_poolset_t *ps, int size,
-				  kib_pool_t **pp_po)
-{
-	struct kib_pmr_pool *ppo;
-	struct kib_pool *pool;
-	kib_phys_mr_t *pmr;
-	int i;
-
-	LIBCFS_CPT_ALLOC(ppo, lnet_cpt_table(),
-			 ps->ps_cpt, sizeof(kib_pmr_pool_t));
-	if (ppo == NULL) {
-		CERROR("Failed to allocate PMR pool\n");
-		return -ENOMEM;
-	}
-
-	pool = &ppo->ppo_pool;
-	kiblnd_init_pool(ps, pool, size);
-
-	for (i = 0; i < size; i++) {
-		LIBCFS_CPT_ALLOC(pmr, lnet_cpt_table(),
-				 ps->ps_cpt, sizeof(kib_phys_mr_t));
-		if (pmr == NULL)
-			break;
-
-		pmr->pmr_pool = ppo;
-		LIBCFS_CPT_ALLOC(pmr->pmr_ipb, lnet_cpt_table(), ps->ps_cpt,
-				 IBLND_MAX_RDMA_FRAGS * sizeof(*pmr->pmr_ipb));
-		if (pmr->pmr_ipb == NULL)
-			break;
-
-		list_add(&pmr->pmr_list, &pool->po_free_list);
-	}
-
-	if (i < size) {
-		ps->ps_pool_destroy(pool);
-		return -ENOMEM;
-	}
-
-	ppo->ppo_hdev = kiblnd_current_hdev(ps->ps_net->ibn_dev);
-	*pp_po = pool;
-	return 0;
-}
-
 static void kiblnd_destroy_tx_pool(kib_pool_t *pool)
 {
 	kib_tx_pool_t *tpo = container_of(pool, kib_tx_pool_t, tpo_pool);
@@ -2078,7 +1944,6 @@ static void kiblnd_net_fini_pools(kib_net_t *net)
 	cfs_cpt_for_each(i, lnet_cpt_table()) {
 		kib_tx_poolset_t *tps;
 		kib_fmr_poolset_t *fps;
-		kib_pmr_poolset_t *pps;
 
 		if (net->ibn_tx_ps != NULL) {
 			tps = net->ibn_tx_ps[i];
@@ -2089,11 +1954,6 @@ static void kiblnd_net_fini_pools(kib_net_t *net)
 			fps = net->ibn_fmr_ps[i];
 			kiblnd_fini_fmr_poolset(fps);
 		}
-
-		if (net->ibn_pmr_ps != NULL) {
-			pps = net->ibn_pmr_ps[i];
-			kiblnd_fini_poolset(&pps->pps_poolset);
-		}
 	}
 
 	if (net->ibn_tx_ps != NULL) {
@@ -2105,18 +1965,13 @@ static void kiblnd_net_fini_pools(kib_net_t *net)
 		cfs_percpt_free(net->ibn_fmr_ps);
 		net->ibn_fmr_ps = NULL;
 	}
-
-	if (net->ibn_pmr_ps != NULL) {
-		cfs_percpt_free(net->ibn_pmr_ps);
-		net->ibn_pmr_ps = NULL;
-	}
 }
 
 static int kiblnd_net_init_pools(kib_net_t *net, __u32 *cpts, int ncpts)
 {
 	unsigned long flags;
 	int cpt;
-	int rc;
+	int		rc = 0;
 	int i;
 
 	read_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
@@ -2137,12 +1992,16 @@ static int kiblnd_net_init_pools(kib_net_t *net, __u32 *cpts, int ncpts)
 		goto failed;
 	}
 
-	/* TX pool must be created later than FMR/PMR, see LU-2268
-	 * for details */
+	/*
+	 * TX pool must be created later than FMR, see LU-2268
+	 * for details
+	 */
 	LASSERT(net->ibn_tx_ps == NULL);
 
-	/* premapping can fail if ibd_nmr > 1, so we always create
-	 * FMR/PMR pool and map-on-demand if premapping failed */
+	/*
+	 * premapping can fail if ibd_nmr > 1, so we always create
+	 * FMR pool and map-on-demand if premapping failed
+	 */
 
 	net->ibn_fmr_ps = cfs_percpt_alloc(lnet_cpt_table(),
 					   sizeof(kib_fmr_poolset_t));
@@ -2158,7 +2017,7 @@ static int kiblnd_net_init_pools(kib_net_t *net, __u32 *cpts, int ncpts)
 					     kiblnd_fmr_pool_size(ncpts),
 					     kiblnd_fmr_flush_trigger(ncpts));
 		if (rc == -ENOSYS && i == 0) /* no FMR */
-			break; /* create PMR pool */
+			break;
 
 		if (rc != 0) { /* a real error */
 			CERROR("Can't initialize FMR pool for CPT %d: %d\n",
@@ -2175,38 +2034,8 @@ static int kiblnd_net_init_pools(kib_net_t *net, __u32 *cpts, int ncpts)
 	cfs_percpt_free(net->ibn_fmr_ps);
 	net->ibn_fmr_ps = NULL;
 
-	CWARN("Device does not support FMR, failing back to PMR\n");
-
-	if (*kiblnd_tunables.kib_pmr_pool_size <
-	    *kiblnd_tunables.kib_ntx / 4) {
-		CERROR("Can't set pmr pool size (%d) < ntx / 4(%d)\n",
-		       *kiblnd_tunables.kib_pmr_pool_size,
-		       *kiblnd_tunables.kib_ntx / 4);
-		rc = -EINVAL;
-		goto failed;
-	}
-
-	net->ibn_pmr_ps = cfs_percpt_alloc(lnet_cpt_table(),
-					   sizeof(kib_pmr_poolset_t));
-	if (net->ibn_pmr_ps == NULL) {
-		CERROR("Failed to allocate PMR pool array\n");
-		rc = -ENOMEM;
-		goto failed;
-	}
-
-	for (i = 0; i < ncpts; i++) {
-		cpt = (cpts == NULL) ? i : cpts[i];
-		rc = kiblnd_init_poolset(&net->ibn_pmr_ps[cpt]->pps_poolset,
-					 cpt, net, "PMR",
-					 kiblnd_pmr_pool_size(ncpts),
-					 kiblnd_create_pmr_pool,
-					 kiblnd_destroy_pmr_pool, NULL, NULL);
-		if (rc != 0) {
-			CERROR("Can't initialize PMR pool for CPT %d: %d\n",
-			       cpt, rc);
+	CWARN("Device does not support FMR\n");
 			goto failed;
-		}
-	}
 
  create_tx_pool:
 	net->ibn_tx_ps = cfs_percpt_alloc(lnet_cpt_table(),
@@ -2318,17 +2147,13 @@ void kiblnd_hdev_destroy(kib_hca_dev_t *hdev)
 static int kiblnd_hdev_setup_mrs(kib_hca_dev_t *hdev)
 {
 	struct ib_mr *mr;
-	int i;
 	int rc;
-	__u64 mm_size;
-	__u64 mr_size;
 	int acflags = IB_ACCESS_LOCAL_WRITE | IB_ACCESS_REMOTE_WRITE;
 
 	rc = kiblnd_hdev_get_attr(hdev);
 	if (rc != 0)
 		return rc;
 
-	if (hdev->ibh_mr_shift == 64) {
 		LIBCFS_ALLOC(hdev->ibh_mrs, 1 * sizeof(*hdev->ibh_mrs));
 		if (hdev->ibh_mrs == NULL) {
 			CERROR("Failed to allocate MRs table\n");
@@ -2347,53 +2172,6 @@ static int kiblnd_hdev_setup_mrs(kib_hca_dev_t *hdev)
 
 		hdev->ibh_mrs[0] = mr;
 
-		goto out;
-	}
-
-	mr_size = 1ULL << hdev->ibh_mr_shift;
-	mm_size = (unsigned long)high_memory - PAGE_OFFSET;
-
-	hdev->ibh_nmrs = (int)((mm_size + mr_size - 1) >> hdev->ibh_mr_shift);
-
-	if (hdev->ibh_mr_shift < 32 || hdev->ibh_nmrs > 1024) {
-		/* it's 4T..., assume we will re-code at that time */
-		CERROR("Can't support memory size: x%#llx with MR size: x%#llx\n",
-		       mm_size, mr_size);
-		return -EINVAL;
-	}
-
-	/* create an array of MRs to cover all memory */
-	LIBCFS_ALLOC(hdev->ibh_mrs, sizeof(*hdev->ibh_mrs) * hdev->ibh_nmrs);
-	if (hdev->ibh_mrs == NULL) {
-		CERROR("Failed to allocate MRs' table\n");
-		return -ENOMEM;
-	}
-
-	for (i = 0; i < hdev->ibh_nmrs; i++) {
-		struct ib_phys_buf ipb;
-		__u64 iova;
-
-		ipb.size = hdev->ibh_mr_size;
-		ipb.addr = i * mr_size;
-		iova = ipb.addr;
-
-		mr = ib_reg_phys_mr(hdev->ibh_pd, &ipb, 1, acflags, &iova);
-		if (IS_ERR(mr)) {
-			CERROR("Failed ib_reg_phys_mr addr %#llx size %#llx : %ld\n",
-			       ipb.addr, ipb.size, PTR_ERR(mr));
-			kiblnd_hdev_cleanup_mrs(hdev);
-			return PTR_ERR(mr);
-		}
-
-		LASSERT(iova == ipb.addr);
-
-		hdev->ibh_mrs[i] = mr;
-	}
-
-out:
-	if (hdev->ibh_mr_size != ~0ULL || hdev->ibh_nmrs != 1)
-		LCONSOLE_INFO("Register global MR array, MR size: %#llx, array size: %d\n",
-			      hdev->ibh_mr_size, hdev->ibh_nmrs);
 	return 0;
 }
 
@@ -2564,14 +2342,9 @@ int kiblnd_dev_failover(kib_dev_t *dev)
 			kiblnd_fail_poolset(&net->ibn_tx_ps[i]->tps_poolset,
 					    &zombie_tpo);
 
-			if (net->ibn_fmr_ps != NULL) {
+			if (net->ibn_fmr_ps)
 				kiblnd_fail_fmr_poolset(net->ibn_fmr_ps[i],
 							&zombie_fpo);
-
-			} else if (net->ibn_pmr_ps != NULL) {
-				kiblnd_fail_poolset(&net->ibn_pmr_ps[i]->
-						    pps_poolset, &zombie_ppo);
-			}
 		}
 	}
 
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
index 8d4580244c26..f4b6c33ac318 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
@@ -104,7 +104,6 @@ typedef struct {
 	int          *kib_map_on_demand;     /* map-on-demand if RD has more
 					      * fragments than this value, 0
 					      * disable map-on-demand */
-	int          *kib_pmr_pool_size;     /* # physical MR in pool */
 	int          *kib_fmr_pool_size;     /* # FMRs in pool */
 	int          *kib_fmr_flush_trigger; /* When to trigger FMR flush */
 	int          *kib_fmr_cache;         /* enable FMR pool cache? */
@@ -163,7 +162,6 @@ kiblnd_concurrent_sends_v1(void)
 /* Pools (shared by connections on each CPT) */
 /* These pools can grow at runtime, so don't need give a very large value */
 #define IBLND_TX_POOL			256
-#define IBLND_PMR_POOL			256
 #define IBLND_FMR_POOL			256
 #define IBLND_FMR_POOL_FLUSH		192
 
@@ -232,17 +230,6 @@ typedef struct {
 	struct page        *ibp_pages[0];       /* page array */
 } kib_pages_t;
 
-struct kib_pmr_pool;
-
-typedef struct {
-	struct list_head    pmr_list;           /* chain node */
-	struct ib_phys_buf  *pmr_ipb;           /* physical buffer */
-	struct ib_mr        *pmr_mr;            /* IB MR */
-	struct kib_pmr_pool *pmr_pool;          /* owner of this MR */
-	__u64               pmr_iova;           /* Virtual I/O address */
-	int                 pmr_refcount;       /* reference count */
-} kib_phys_mr_t;
-
 struct kib_pool;
 struct kib_poolset;
 
@@ -299,15 +286,6 @@ typedef struct {
 } kib_tx_pool_t;
 
 typedef struct {
-	kib_poolset_t         pps_poolset;        /* pool-set */
-} kib_pmr_poolset_t;
-
-typedef struct kib_pmr_pool {
-	struct kib_hca_dev    *ppo_hdev;          /* device for this pool */
-	kib_pool_t            ppo_pool;           /* pool */
-} kib_pmr_pool_t;
-
-typedef struct {
 	spinlock_t            fps_lock;            /* serialize */
 	struct kib_net        *fps_net;            /* IB network */
 	struct list_head      fps_pool_list;       /* FMR pool list */
@@ -347,7 +325,6 @@ typedef struct kib_net {
 
 	kib_tx_poolset_t      **ibn_tx_ps;    /* tx pool-set */
 	kib_fmr_poolset_t     **ibn_fmr_ps;   /* fmr pool-set */
-	kib_pmr_poolset_t     **ibn_pmr_ps;   /* pmr pool-set */
 
 	kib_dev_t             *ibn_dev;       /* underlying IB device */
 } kib_net_t;
@@ -554,10 +531,7 @@ typedef struct kib_tx                         /* transmit message */
 	int                    tx_nfrags;     /* # entries in... */
 	struct scatterlist     *tx_frags;     /* dma_map_sg descriptor */
 	__u64                  *tx_pages;     /* rdma phys page addrs */
-	union {
-		kib_phys_mr_t  *pmr;          /* MR for physical buffer */
-		kib_fmr_t      fmr;           /* FMR */
-	}                      tx_u;
+	kib_fmr_t		fmr;	      /* FMR */
 	int                    tx_dmadir;     /* dma direction */
 } kib_tx_t;
 
@@ -978,10 +952,6 @@ int  kiblnd_fmr_pool_map(kib_fmr_poolset_t *fps, __u64 *pages,
 			 int npages, __u64 iov, kib_fmr_t *fmr);
 void kiblnd_fmr_pool_unmap(kib_fmr_t *fmr, int status);
 
-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);
-void kiblnd_pmr_pool_unmap(kib_phys_mr_t *pmr);
-
 int  kiblnd_startup(lnet_ni_t *ni);
 void kiblnd_shutdown(lnet_ni_t *ni);
 int  kiblnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg);
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 5a8ebe1b3c84..a23a6d956a4d 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -121,7 +121,6 @@ kiblnd_get_idle_tx(lnet_ni_t *ni, lnet_nid_t target)
 	LASSERT(tx->tx_conn == NULL);
 	LASSERT(tx->tx_lntmsg[0] == NULL);
 	LASSERT(tx->tx_lntmsg[1] == NULL);
-	LASSERT(tx->tx_u.pmr == NULL);
 	LASSERT(tx->tx_nfrags == 0);
 
 	return tx;
@@ -575,7 +574,7 @@ kiblnd_fmr_map_tx(kib_net_t *net, kib_tx_t *tx, kib_rdma_desc_t *rd, int nob)
 	cpt = tx->tx_pool->tpo_pool.po_owner->ps_cpt;
 
 	fps = net->ibn_fmr_ps[cpt];
-	rc = kiblnd_fmr_pool_map(fps, pages, npages, 0, &tx->tx_u.fmr);
+	rc = kiblnd_fmr_pool_map(fps, pages, npages, 0, &tx->fmr);
 	if (rc != 0) {
 		CERROR("Can't map %d pages: %d\n", npages, rc);
 		return rc;
@@ -583,8 +582,8 @@ kiblnd_fmr_map_tx(kib_net_t *net, kib_tx_t *tx, kib_rdma_desc_t *rd, int nob)
 
 	/* If rd is not tx_rd, it's going to get sent to a peer, who will need
 	 * the rkey */
-	rd->rd_key = (rd != tx->tx_rd) ? tx->tx_u.fmr.fmr_pfmr->fmr->rkey :
-					 tx->tx_u.fmr.fmr_pfmr->fmr->lkey;
+	rd->rd_key = (rd != tx->tx_rd) ? tx->fmr.fmr_pfmr->fmr->rkey :
+					 tx->fmr.fmr_pfmr->fmr->lkey;
 	rd->rd_frags[0].rf_addr &= ~hdev->ibh_page_mask;
 	rd->rd_frags[0].rf_nob = nob;
 	rd->rd_nfrags = 1;
@@ -592,42 +591,6 @@ kiblnd_fmr_map_tx(kib_net_t *net, kib_tx_t *tx, kib_rdma_desc_t *rd, int nob)
 	return 0;
 }
 
-static int
-kiblnd_pmr_map_tx(kib_net_t *net, kib_tx_t *tx, kib_rdma_desc_t *rd, int nob)
-{
-	kib_hca_dev_t *hdev;
-	kib_pmr_poolset_t *pps;
-	__u64 iova;
-	int cpt;
-	int rc;
-
-	LASSERT(tx->tx_pool != NULL);
-	LASSERT(tx->tx_pool->tpo_pool.po_owner != NULL);
-
-	hdev = tx->tx_pool->tpo_hdev;
-
-	iova = rd->rd_frags[0].rf_addr & ~hdev->ibh_page_mask;
-
-	cpt = tx->tx_pool->tpo_pool.po_owner->ps_cpt;
-
-	pps = net->ibn_pmr_ps[cpt];
-	rc = kiblnd_pmr_pool_map(pps, hdev, rd, &iova, &tx->tx_u.pmr);
-	if (rc != 0) {
-		CERROR("Failed to create MR by phybuf: %d\n", rc);
-		return rc;
-	}
-
-	/* If rd is not tx_rd, it's going to get sent to a peer, who will need
-	 * the rkey */
-	rd->rd_key = (rd != tx->tx_rd) ? tx->tx_u.pmr->pmr_mr->rkey :
-					 tx->tx_u.pmr->pmr_mr->lkey;
-	rd->rd_nfrags = 1;
-	rd->rd_frags[0].rf_addr = iova;
-	rd->rd_frags[0].rf_nob = nob;
-
-	return 0;
-}
-
 void
 kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx)
 {
@@ -635,13 +598,9 @@ kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx)
 
 	LASSERT(net != NULL);
 
-	if (net->ibn_fmr_ps != NULL && tx->tx_u.fmr.fmr_pfmr != NULL) {
-		kiblnd_fmr_pool_unmap(&tx->tx_u.fmr, tx->tx_status);
-		tx->tx_u.fmr.fmr_pfmr = NULL;
-
-	} else if (net->ibn_pmr_ps != NULL && tx->tx_u.pmr != NULL) {
-		kiblnd_pmr_pool_unmap(tx->tx_u.pmr);
-		tx->tx_u.pmr = NULL;
+	if (net->ibn_fmr_ps && tx->fmr.fmr_pfmr) {
+		kiblnd_fmr_pool_unmap(&tx->fmr, tx->tx_status);
+		tx->fmr.fmr_pfmr = NULL;
 	}
 
 	if (tx->tx_nfrags != 0) {
@@ -687,8 +646,6 @@ kiblnd_map_tx(lnet_ni_t *ni, kib_tx_t *tx,
 
 	if (net->ibn_fmr_ps != NULL)
 		return kiblnd_fmr_map_tx(net, tx, rd, nob);
-	else if (net->ibn_pmr_ps != NULL)
-		return kiblnd_pmr_map_tx(net, tx, rd, nob);
 
 	return -EINVAL;
 }
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
index b0e00361cfce..b3d1b5d627cb 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
@@ -126,11 +126,6 @@ static int fmr_cache = 1;
 module_param(fmr_cache, int, 0444);
 MODULE_PARM_DESC(fmr_cache, "non-zero to enable FMR caching");
 
-/* NB: this value is shared by all CPTs, it can grow at runtime */
-static int pmr_pool_size = 512;
-module_param(pmr_pool_size, int, 0444);
-MODULE_PARM_DESC(pmr_pool_size, "size of MR cache pmr pool on each CPT");
-
 /*
  * 0: disable failover
  * 1: enable failover if necessary
@@ -170,7 +165,6 @@ kib_tunables_t kiblnd_tunables = {
 	.kib_fmr_pool_size     = &fmr_pool_size,
 	.kib_fmr_flush_trigger = &fmr_flush_trigger,
 	.kib_fmr_cache         = &fmr_cache,
-	.kib_pmr_pool_size     = &pmr_pool_size,
 	.kib_require_priv_port = &require_privileged_port,
 	.kib_use_priv_port     = &use_privileged_port,
 	.kib_nscheds           = &nscheds
-- 
2.5.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the nfs tree

[Trond Myklebust]

Hi Stephen,

On Sun, Aug 23, 2015 at 7:16 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Trond,
>
> On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell <sfr@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

Re: linux-next: build failure after merge of the nfs tree

[Oleg Drokin]

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 <sfr@canb.auug.org.au> wrote:
>> Hi Trond,
>> 
>> On Tue, 18 Aug 2015 10:56:34 +1000 Stephen Rothwell <sfr@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

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]

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 <sfr@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 <sfr@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 Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the nfs tree

[Christoph Hellwig]

Thanks Stephen!

Trond, can you just pick up the patch?  Considered it:

Reviewed-by: Christoph Hellwig <hch@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 <sfr@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 <sfr@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 Rothwell                    sfr@canb.auug.org.au


---end quoted text---

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from fs/nfs/dns_resolve.c:52:0:
fs/nfs/netns.h:28:15: error: 'NFS4_MAX_MINOR_VERSION' undeclared here (not in a function)
  int cb_users[NFS4_MAX_MINOR_VERSION + 1];

Presumably caused by commit 1a29448203ea ("NFS: Enabling v4.2 should not
recompile nfsd and lockd").  This commit is not doing well :-(

I have reverted that commit again for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

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").

I have used the nfs tree from next-20121001 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

RE: linux-next: build failure after merge of the nfs tree

[Myklebust, Trond]

> -----Original Message-----
> From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-
> owner@vger.kernel.org] On Behalf Of Stephen Rothwell
> Sent: Monday, October 01, 2012 8:39 PM
> To: Trond Myklebust
> Cc: linux-next@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

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 969 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/nfs/super.c: In function 'nfs_get_cache_cookie':
fs/nfs/super.c:2361:12: error: 'struct nfs_server' has no member named 'fscache_key'
fs/nfs/super.c:2362:16: error: 'struct nfs_server' has no member named 'fscache_key'
fs/nfs/super.c:2363:16: error: 'struct nfs_server' has no member named 'fscache_key'
fs/nfs/super.c:2367:2: warning: passing argument 3 of 'nfs_fscache_get_super_cookie' makes pointer from integer without a cast [enabled by default]
fs/nfs/fscache.h:173:20: note: expected 'struct nfs_clone_mount *' but argument is of type 'int'

Casued by commit 2311b9439ce8 ("NFS: Don't pass mount data to
nfs_fscache_get_super_cookie()").  This build has CONFIG_NFS_FSCACHE
unset.  grep is your friend.

I have used the nfs tree from next-20120514 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the nfs tree

[Myklebust, Trond]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1321 bytes --]

On Wed, 2012-05-16 at 12:49 +1000, Stephen Rothwell wrote:
> Hi Trond,
> 
> After merging the nfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/nfs/super.c: In function 'nfs_get_cache_cookie':
> fs/nfs/super.c:2361:12: error: 'struct nfs_server' has no member named 'fscache_key'
> fs/nfs/super.c:2362:16: error: 'struct nfs_server' has no member named 'fscache_key'
> fs/nfs/super.c:2363:16: error: 'struct nfs_server' has no member named 'fscache_key'
> fs/nfs/super.c:2367:2: warning: passing argument 3 of 'nfs_fscache_get_super_cookie' makes pointer from integer without a cast [enabled by default]
> fs/nfs/fscache.h:173:20: note: expected 'struct nfs_clone_mount *' but argument is of type 'int'
> 
> Casued by commit 2311b9439ce8 ("NFS: Don't pass mount data to
> nfs_fscache_get_super_cookie()").  This build has CONFIG_NFS_FSCACHE
> unset.  grep is your friend.
> 
> I have used the nfs tree from next-20120514 for today.
> 

Thanks Stephen! I've added a fix for this in todays linux-next branch.

Cheers
  Trond
-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: linux-next: build failure after merge of the nfs tree

[Myklebust, Trond]

On Wed, 2012-05-16 at 12:49 +1000, Stephen Rothwell wrote:
> Hi Trond,
> 
> After merging the nfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/nfs/super.c: In function 'nfs_get_cache_cookie':
> fs/nfs/super.c:2361:12: error: 'struct nfs_server' has no member named 'fscache_key'
> fs/nfs/super.c:2362:16: error: 'struct nfs_server' has no member named 'fscache_key'
> fs/nfs/super.c:2363:16: error: 'struct nfs_server' has no member named 'fscache_key'
> fs/nfs/super.c:2367:2: warning: passing argument 3 of 'nfs_fscache_get_super_cookie' makes pointer from integer without a cast [enabled by default]
> fs/nfs/fscache.h:173:20: note: expected 'struct nfs_clone_mount *' but argument is of type 'int'
> 
> Casued by commit 2311b9439ce8 ("NFS: Don't pass mount data to
> nfs_fscache_get_super_cookie()").  This build has CONFIG_NFS_FSCACHE
> unset.  grep is your friend.
> 
> I have used the nfs tree from next-20120514 for today.
> 

Thanks Stephen! I've added a fix for this in todays linux-next branch.

Cheers
  Trond
-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build
(powerpc_ppc64_defconfig) failed like this:

fs/nfs/callback_xdr.c: In function 'decode_stateid':
fs/nfs/callback_xdr.c:144:16: error: 'nfs4_stateid' has no member named 'data'

Caused by commit 4af2db6d9480 ("NFSv4: Simplify the struct nfs4_stateid").

I have used the nfs tree from next-20120302 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the nfs tree

[Myklebust, Trond]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 842 bytes --]

On Mon, 2012-03-05 at 11:45 +1100, Stephen Rothwell wrote:
> Hi Trond,
> 
> After merging the nfs tree, today's linux-next build
> (powerpc_ppc64_defconfig) failed like this:
> 
> fs/nfs/callback_xdr.c: In function 'decode_stateid':
> fs/nfs/callback_xdr.c:144:16: error: 'nfs4_stateid' has no member named 'data'
> 
> Caused by commit 4af2db6d9480 ("NFSv4: Simplify the struct nfs4_stateid").
> 
> I have used the nfs tree from next-20120302 for today.

Hi Stephen,

Thanks! This bug should now be fixed up in the new commit
dc9ea892baa10df52337c9d4e83146fe9798c5df.

Cheers
 Trond
-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: linux-next: build failure after merge of the nfs tree

[Myklebust, Trond]

On Mon, 2012-03-05 at 11:45 +1100, Stephen Rothwell wrote:
> Hi Trond,
> 
> After merging the nfs tree, today's linux-next build
> (powerpc_ppc64_defconfig) failed like this:
> 
> fs/nfs/callback_xdr.c: In function 'decode_stateid':
> fs/nfs/callback_xdr.c:144:16: error: 'nfs4_stateid' has no member named 'data'
> 
> Caused by commit 4af2db6d9480 ("NFSv4: Simplify the struct nfs4_stateid").
> 
> I have used the nfs tree from next-20120302 for today.

Hi Stephen,

Thanks! This bug should now be fixed up in the new commit
dc9ea892baa10df52337c9d4e83146fe9798c5df.

Cheers
 Trond
-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2064 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/target/iscsi/iscsi_target_configfs.c: In function 'lio_target_call_addnptotpg':
drivers/target/iscsi/iscsi_target_configfs.c:214:3: error: implicit declaration of function 'in6_pton' [-Werror=implicit-function-declaration]
drivers/target/iscsi/iscsi_target_configfs.c:239:3: error: implicit declaration of function 'in_aton' [-Werror=implicit-function-declaration]

Presumably caused by some include file cleanup in the nfs tree (probably
commit 0b5357cfc2e6 "NFS: Remove unnecessary includes from
linux/nfs_fs_i.h").

I applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 23 Jan 2012 11:35:02 +1100
Subject: [PATCH] iscsi: in_aton needs linux/inet.h

so include it directly.

Fixes this error after a recent nfs cleanup:

drivers/target/iscsi/iscsi_target_configfs.c: In function 'lio_target_call_addnptotpg':
drivers/target/iscsi/iscsi_target_configfs.c:214:3: error: implicit declaration of function 'in6_pton' [-Werror=implicit-function-declaration]
drivers/target/iscsi/iscsi_target_configfs.c:239:3: error: implicit declaration of function 'in_aton' [-Werror=implicit-function-declaration]

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/target/iscsi/iscsi_target_configfs.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 3468caa..6b35b37 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -21,6 +21,7 @@
 
 #include <linux/configfs.h>
 #include <linux/export.h>
+#include <linux/inet.h>
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
 #include <target/target_core_fabric_configfs.h>
-- 
1.7.9.rc0.23.g7e521

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the nfs tree

[Trond Myklebust]

On Mon, 2012-01-23 at 11:39 +1100, Stephen Rothwell wrote: 
> Hi Trond,
> 
> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/target/iscsi/iscsi_target_configfs.c: In function 'lio_target_call_addnptotpg':
> drivers/target/iscsi/iscsi_target_configfs.c:214:3: error: implicit declaration of function 'in6_pton' [-Werror=implicit-function-declaration]
> drivers/target/iscsi/iscsi_target_configfs.c:239:3: error: implicit declaration of function 'in_aton' [-Werror=implicit-function-declaration]
> 
> Presumably caused by some include file cleanup in the nfs tree (probably
> commit 0b5357cfc2e6 "NFS: Remove unnecessary includes from
> linux/nfs_fs_i.h").
> 
> I applied the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 23 Jan 2012 11:35:02 +1100
> Subject: [PATCH] iscsi: in_aton needs linux/inet.h
> 
> so include it directly.
> 
> Fixes this error after a recent nfs cleanup:
> 
> drivers/target/iscsi/iscsi_target_configfs.c: In function 'lio_target_call_addnptotpg':
> drivers/target/iscsi/iscsi_target_configfs.c:214:3: error: implicit declaration of function 'in6_pton' [-Werror=implicit-function-declaration]
> drivers/target/iscsi/iscsi_target_configfs.c:239:3: error: implicit declaration of function 'in_aton' [-Werror=implicit-function-declaration]
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/target/iscsi/iscsi_target_configfs.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
> index 3468caa..6b35b37 100644
> --- a/drivers/target/iscsi/iscsi_target_configfs.c
> +++ b/drivers/target/iscsi/iscsi_target_configfs.c
> @@ -21,6 +21,7 @@
>  
>  #include <linux/configfs.h>
>  #include <linux/export.h>
> +#include <linux/inet.h>
>  #include <target/target_core_base.h>
>  #include <target/target_core_fabric.h>
>  #include <target/target_core_fabric_configfs.h>

Hi Stephen,

Yep. I believe that is identical to the patch Bryan sent to James
Bottomley a few days ago. Could you please carry the above in your tree
until the iscsi folks get around to fixing this?

Cheers
  Trond

-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com

Re: linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 395 bytes --]

Hi Trond,

On Mon, 23 Jan 2012 13:13:09 -0500 Trond Myklebust <Trond.Myklebust@netapp.com> wrote:
>
> Yep. I believe that is identical to the patch Bryan sent to James
> Bottomley a few days ago. Could you please carry the above in your tree
> until the iscsi folks get around to fixing this?

Yeah, no problem.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

fs/nfs/nfs4state.c: In function 'nfs4_schedule_session_recovery':
fs/nfs/nfs4state.c:1469: error: 'clp' undeclared (first use in this function)

Caused by commit 67191d2ed1e4 ("NFSv4.1: Fix the handling of
NFS4ERR_SEQ_MISORDERED errors").  This was clearly never compiled :-(

I have used the nfs tree from next-20110526 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from fs/nfs/client.c:45:
fs/nfs/nfs4_fs.h: In function 'nfs4_schedule_session_recovery':
fs/nfs/nfs4_fs.h:303: error: parameter name omitted

Caused by commit 13ffe1da57fb ("NFSv4/4.1: Fix
nfs4_schedule_state_recovery abuses").

If you add code that is obviously affected by config options, it is worth
while build testing with and without those options ... in this case
CONFIG_NFS_V4_1 is not set.

I have used the nfs tree from next-20110310 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 715 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/nfs/inode.c: In function 'nfs_compat_user_ino64':
fs/nfs/inode.c:93: error: 'compat_ulong_t' undeclared (first use in this function)
fs/nfs/inode.c:93: error: expected ';' before 'ino'
fs/nfs/inode.c:100: error: 'ino' undeclared (first use in this function)

Caused by commit 5fa1ca22302da56ffa568e847100e80be90cc602 ("(try3-resend)
Fix nfs_compat_user_ino64 so it doesn't cause problems if bit 31 or 63
are set in fileid").

I have used the nfs tree from next-20110307 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the nfs tree

[Trond Myklebust]

On Tue, 2011-03-08 at 12:07 +1100, Stephen Rothwell wrote: 
> Hi Trond,
> 
> After merging the nfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/nfs/inode.c: In function 'nfs_compat_user_ino64':
> fs/nfs/inode.c:93: error: 'compat_ulong_t' undeclared (first use in this function)
> fs/nfs/inode.c:93: error: expected ';' before 'ino'
> fs/nfs/inode.c:100: error: 'ino' undeclared (first use in this function)
> 
> Caused by commit 5fa1ca22302da56ffa568e847100e80be90cc602 ("(try3-resend)
> Fix nfs_compat_user_ino64 so it doesn't cause problems if bit 31 or 63
> are set in fileid").
> 
> I have used the nfs tree from next-20110307 for today.

Thanks Stephen!

It looks to me as if we need to add a '#include <compat.h>'. I'll fix up
the patch...

Cheers
  Trond

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 801 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/nfs/dir.c: In function 'nfs_readdir_free_large_page':
fs/nfs/dir.c:475: error: implicit declaration of function 'vm_unmap_ram'
fs/nfs/dir.c: In function 'nfs_readdir_large_page':
fs/nfs/dir.c:496: error: implicit declaration of function 'vm_map_ram'
fs/nfs/dir.c:496: warning: assignment makes pointer from integer without a cast

Caused by commit b8aa6064474e186f598584508f9230d49a0004af ("NFS: readdir
with vmapped pages").  Forgot to include linux/vmalloc.h.  See Rule 1 (in
Documentation/SubmitChecklist).

I have used the nfs tree from next-20101020 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the nfs tree

[Trond Myklebust]

On Thu, 2010-10-21 at 11:38 +1100, Stephen Rothwell wrote:
> Hi Trond,
> 
> After merging the nfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/nfs/dir.c: In function 'nfs_readdir_free_large_page':
> fs/nfs/dir.c:475: error: implicit declaration of function 'vm_unmap_ram'
> fs/nfs/dir.c: In function 'nfs_readdir_large_page':
> fs/nfs/dir.c:496: error: implicit declaration of function 'vm_map_ram'
> fs/nfs/dir.c:496: warning: assignment makes pointer from integer without a cast
> 
> Caused by commit b8aa6064474e186f598584508f9230d49a0004af ("NFS: readdir
> with vmapped pages").  Forgot to include linux/vmalloc.h.  See Rule 1 (in
> Documentation/SubmitChecklist).
> 
> I have used the nfs tree from next-20101020 for today.

Thanks Stephen! Fixed in my linux-next branch.

Bryan, please make sure that you update your patches.

Cheers
  Trond

linux-next: build failure after merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 610 bytes --]

Hi Trond,

After merging the nfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

net/sunrpc/xprt.c: In function 'xprt_release':
net/sunrpc/xprt.c:1045: error: implicit declaration of function 'xprt_free_bc_request'

Caused by commit 0d28e05a53109bb52f254d5eac25dac6e3768b04 ("SUNRPC: Fix a
use after free bug with the NFSv4.1 backchannel").  xprt_free_bc_request()
is only declared for CONFIG_NFS_V4_1 ...

I have used the nfs tree from next-20100319 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: build failure after merge of the nfs tree

[Trond Myklebust]

On Mar 21, 2010, at 20:26, Stephen Rothwell <sfr@canb.auug.org.au>  
wrote:

> Hi Trond,
>
> After merging the nfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> net/sunrpc/xprt.c: In function 'xprt_release':
> net/sunrpc/xprt.c:1045: error: implicit declaration of function  
> 'xprt_free_bc_request'
>
> Caused by commit 0d28e05a53109bb52f254d5eac25dac6e3768b04 ("SUNRPC:  
> Fix a
> use after free bug with the NFSv4.1 backchannel").   
> xprt_free_bc_request()
> is only declared for CONFIG_NFS_V4_1 ...
>
> I have used the nfs tree from next-20100319 for today.

Hi Stephen

Sorry about that. I've got a fix for the above (just need to define  
empty inline function for the !CONFIG_NFS_V4_1 case).

I'll try to upload it later today. (I am unfortunately travelling so  
wifi access is a bit spotty).

Cheers
     Trond