linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the ceph tree
@ 2013-09-27  1:31 Stephen Rothwell
  2013-09-27  2:36 ` Dave Kleikamp
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2013-09-27  1:31 UTC (permalink / raw)
  To: Sage Weil; +Cc: linux-next, linux-kernel, majianpeng, Zach Brown, Dave Kleikamp

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

Hi Sage,

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

fs/ceph/file.c: In function 'ceph_sync_direct_write':
fs/ceph/file.c:545:24: error: 'struct iov_iter' has no member named 'iov'
   void __user *data = i.iov->iov_base + i.iov_offset;
                        ^
fs/ceph/file.c:546:14: error: 'struct iov_iter' has no member named 'iov'
   u64 len = i.iov->iov_len - i.iov_offset;
              ^

This also happened yesterday but was swamped by the other error (now fixed).

Caused by commit d4ce96db671b ("ceph: Implement writev/pwritev for sync
operation") interacting with commit f6794d33a5ec ("iov_iter: hide iovec
details behind ops function pointers") from the aio-direct tree.

I applied the following merge fix patch (but there may be a better
solution):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 27 Sep 2013 11:28:05 +1000
Subject: [PATCH] ceph: fix up for iov_iter changes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/ceph/file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 5cf034e..1216372 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -542,8 +542,8 @@ ceph_sync_direct_write(struct kiocb *iocb, const struct iovec *iov,
 	iov_iter_init(&i, iov, nr_segs, count, 0);
 
 	while (iov_iter_count(&i) > 0) {
-		void __user *data = i.iov->iov_base + i.iov_offset;
-		u64 len = i.iov->iov_len - i.iov_offset;
+		void __user *data = iov_iter_iovec(&i)->iov_base + i.iov_offset;
+		u64 len = iov_iter_iovec(&i)->iov_len - i.iov_offset;
 
 		page_align = (unsigned long)data & ~PAGE_MASK;
 
-- 
1.8.4.rc3

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

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

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: linux-next: build failure after merge of the ceph tree
  2013-09-27  1:31 linux-next: build failure after merge of the ceph tree Stephen Rothwell
@ 2013-09-27  2:36 ` Dave Kleikamp
  0 siblings, 0 replies; 12+ messages in thread
From: Dave Kleikamp @ 2013-09-27  2:36 UTC (permalink / raw)
  To: Stephen Rothwell, Sage Weil
  Cc: linux-next, linux-kernel, majianpeng, Zach Brown

On 09/26/2013 08:31 PM, Stephen Rothwell wrote:
> Hi Sage,
> 
> After merging the ceph tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/ceph/file.c: In function 'ceph_sync_direct_write':
> fs/ceph/file.c:545:24: error: 'struct iov_iter' has no member named 'iov'
>    void __user *data = i.iov->iov_base + i.iov_offset;
>                         ^
> fs/ceph/file.c:546:14: error: 'struct iov_iter' has no member named 'iov'
>    u64 len = i.iov->iov_len - i.iov_offset;
>               ^
> 
> This also happened yesterday but was swamped by the other error (now fixed).
> 
> Caused by commit d4ce96db671b ("ceph: Implement writev/pwritev for sync
> operation") interacting with commit f6794d33a5ec ("iov_iter: hide iovec
> details behind ops function pointers") from the aio-direct tree.
> 
> I applied the following merge fix patch (but there may be a better
> solution):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 27 Sep 2013 11:28:05 +1000
> Subject: [PATCH] ceph: fix up for iov_iter changes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/ceph/file.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index 5cf034e..1216372 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -542,8 +542,8 @@ ceph_sync_direct_write(struct kiocb *iocb, const struct iovec *iov,
>  	iov_iter_init(&i, iov, nr_segs, count, 0);
>  
>  	while (iov_iter_count(&i) > 0) {
> -		void __user *data = i.iov->iov_base + i.iov_offset;
> -		u64 len = i.iov->iov_len - i.iov_offset;
> +		void __user *data = iov_iter_iovec(&i)->iov_base + i.iov_offset;
> +		u64 len = iov_iter_iovec(&i)->iov_len - i.iov_offset;
>  
>  		page_align = (unsigned long)data & ~PAGE_MASK;
>  

iov_iter_iovec(&i) will resolve to iov, so this is a little simpler

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
---
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 5cf034e..d9aa924 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -542,8 +542,8 @@ ceph_sync_direct_write(struct kiocb *iocb, const
struct iovec *iov,
 	iov_iter_init(&i, iov, nr_segs, count, 0);

 	while (iov_iter_count(&i) > 0) {
-		void __user *data = i.iov->iov_base + i.iov_offset;
-		u64 len = i.iov->iov_len - i.iov_offset;
+		void __user *data = iov->iov_base + i.iov_offset;
+		u64 len = iov->iov_len - i.iov_offset;

 		page_align = (unsigned long)data & ~PAGE_MASK;

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* linux-next: build failure after merge of the ceph tree
@ 2020-12-14 23:46 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2020-12-14 23:46 UTC (permalink / raw)
  To: Jeff Layton, Ilya Dryomov, Herbert Xu, Linux Crypto List
  Cc: Eric Biggers, Linus Torvalds, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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

net/ceph/messenger_v2.c:13:10: fatal error: crypto/sha.h: No such file or directory
   13 | #include <crypto/sha.h>
      |          ^~~~~~~~~~~~~~

Caused by commit

  cd1a677cad99 ("libceph, ceph: implement msgr2.1 protocol (crc and secure modes)")

interacting with commit

  a24d22b225ce ("crypto: sha - split sha.h into sha1.h and sha2.h")

from the crypto tree (and now in Linus' tree).

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Dec 2020 10:40:58 +1100
Subject: [PATCH] fixup for "crypto: sha - split sha.h into sha1.h and sha2.h"

conflicting with

"libceph, ceph: implement msgr2.1 protocol (crc and secure modes)"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/ceph/messenger_v2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c
index 5e38c847317b..c1ebb2aa08b5 100644
--- a/net/ceph/messenger_v2.c
+++ b/net/ceph/messenger_v2.c
@@ -10,7 +10,7 @@
 #include <crypto/aead.h>
 #include <crypto/algapi.h>  /* for crypto_memneq() */
 #include <crypto/hash.h>
-#include <crypto/sha.h>
+#include <crypto/sha2.h>
 #include <linux/bvec.h>
 #include <linux/crc32c.h>
 #include <linux/net.h>
-- 
2.29.2

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: linux-next: build failure after merge of the ceph tree
  2013-09-26  1:20 ` majianpeng
@ 2013-09-26  1:26   ` Sage Weil
  0 siblings, 0 replies; 12+ messages in thread
From: Sage Weil @ 2013-09-26  1:26 UTC (permalink / raw)
  To: majianpeng
  Cc: Stephen Rothwell, Sage Weil, linux-next, LKML, Kent Overstreet,
	Benjamin LaHaise

On Thu, 26 Sep 2013, majianpeng wrote:
> Sorry for that, i notice the commit 73a7075e3f6e.But i misread it.
> I'll modify this as soon as possible.

Thanks!  For now I'll drop this patch and rebase the queue against 
3.12-rc2.

Thanks, Stephen!
sage

> 
> Thanks!
> Jianpeng Ma
> >Hi Sage,
> >
> >After merging the ceph tree, today's linux-next build (x86_64
> >allmodconfig) failed like this:
> >
> >In file included from include/linux/kernel.h:14:0,
> >                 from include/linux/cache.h:4,
> >                 from include/linux/time.h:4,
> >                 from include/linux/stat.h:18,
> >                 from include/linux/module.h:10,
> >                 from fs/ceph/file.c:3:
> >fs/ceph/file.c: In function 'ceph_sync_read':
> >fs/ceph/file.c:421:21: error: 'struct kiocb' has no member named 'ki_left'
> >       (unsigned)iocb->ki_left,
> >                     ^
> >include/linux/dynamic_debug.h:79:10: note: in definition of macro 'dynamic_pr_debug'
> >        ##__VA_ARGS__);  \
> >          ^
> >include/linux/ceph/ceph_debug.h:17:2: note: in expansion of macro 'pr_debug'
> >  pr_debug("%.*s %12.12s:%-4d : " fmt,    \
> >  ^
> >fs/ceph/file.c:420:2: note: in expansion of macro 'dout'
> >  dout("sync_read on file %p %llu~%u %s\n", file, off,
> >  ^
> >fs/ceph/file.c:430:17: error: 'struct kiocb' has no member named 'ki_left'
> >       off + iocb->ki_left);
> >                 ^
> >fs/ceph/file.c:436:25: error: 'struct iov_iter' has no member named 'iov'
> >    void __user *data = i->iov[0].iov_base + i->iov_offset;
> >                         ^
> >fs/ceph/file.c:437:18: error: 'struct iov_iter' has no member named 'iov'
> >    size_t len = i->iov[0].iov_len - i->iov_offset;
> >                  ^
> >fs/ceph/file.c:458:20: error: 'struct kiocb' has no member named 'ki_left'
> >   size_t len = iocb->ki_left;
> >                    ^
> >fs/ceph/file.c:471:26: error: 'struct iov_iter' has no member named 'iov'
> >     void __user *data = i->iov[0].iov_base
> >                          ^
> >In file included from include/linux/cache.h:4:0,
> >                 from include/linux/time.h:4,
> >                 from include/linux/stat.h:18,
> >                 from include/linux/module.h:10,
> >                 from fs/ceph/file.c:3:
> >fs/ceph/file.c:473:14: error: 'struct iov_iter' has no member named 'iov'
> >     l = min(i->iov[0].iov_len - i->iov_offset,
> >              ^
> >include/linux/kernel.h:670:9: note: in definition of macro 'min'
> >  typeof(x) _min1 = (x);   \
> >         ^
> >fs/ceph/file.c:473:14: error: 'struct iov_iter' has no member named 'iov'
> >     l = min(i->iov[0].iov_len - i->iov_offset,
> >              ^
> >include/linux/kernel.h:670:21: note: in definition of macro 'min'
> >  typeof(x) _min1 = (x);   \
> >                     ^
> >include/linux/kernel.h:672:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> >  (void) (&_min1 == &_min2);  \
> >                 ^
> >fs/ceph/file.c:473:9: note: in expansion of macro 'min'
> >     l = min(i->iov[0].iov_len - i->iov_offset,
> >         ^
> >fs/ceph/file.c:496:7: error: 'struct kiocb' has no member named 'ki_left'
> >   iocb->ki_left -= ret;
> >       ^
> >fs/ceph/file.c: In function 'ceph_sync_direct_write':
> >fs/ceph/file.c:588:24: error: 'struct iov_iter' has no member named 'iov'
> >   void __user *data = i.iov->iov_base + i.iov_offset;
> >                        ^
> >fs/ceph/file.c:589:14: error: 'struct iov_iter' has no member named 'iov'
> >   u64 len = i.iov->iov_len - i.iov_offset;
> >              ^
> >fs/ceph/file.c: In function 'ceph_aio_read':
> >fs/ceph/file.c:839:7: error: 'struct kiocb' has no member named 'ki_left'
> >   iocb->ki_left = len;
> >       ^
> >fs/ceph/file.c:870:8: error: 'struct kiocb' has no member named 'ki_left'
> >    iocb->ki_left) {
> >        ^
> >
> >Caused by commit e6c9af8b8f11 ("ceph: implement readv/preadv for sync
> >operation").  ki_left was removed by commit 73a7075e3f6e ("aio: Kill
> >aio_rw_vect_retry()") during the merge window ... basing new work for
> >v3.13 on v3.11 is a bit problematic.
> >
> >I have used the ceph tree from next-20130925 for today.
> >
> >-- 
> >Cheers,
> >Stephen Rothwell                    sfr@canb.auug.org.au
> >

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: linux-next: build failure after merge of the ceph tree
  2013-09-26  1:15 Stephen Rothwell
@ 2013-09-26  1:20 ` majianpeng
  2013-09-26  1:26   ` Sage Weil
  0 siblings, 1 reply; 12+ messages in thread
From: majianpeng @ 2013-09-26  1:20 UTC (permalink / raw)
  To: Stephen Rothwell, Sage Weil
  Cc: linux-next, LKML, Kent Overstreet, Benjamin LaHaise

Sorry for that, i notice the commit 73a7075e3f6e.But i misread it.
I'll modify this as soon as possible.

Thanks!
Jianpeng Ma
>Hi Sage,
>
>After merging the ceph tree, today's linux-next build (x86_64
>allmodconfig) failed like this:
>
>In file included from include/linux/kernel.h:14:0,
>                 from include/linux/cache.h:4,
>                 from include/linux/time.h:4,
>                 from include/linux/stat.h:18,
>                 from include/linux/module.h:10,
>                 from fs/ceph/file.c:3:
>fs/ceph/file.c: In function 'ceph_sync_read':
>fs/ceph/file.c:421:21: error: 'struct kiocb' has no member named 'ki_left'
>       (unsigned)iocb->ki_left,
>                     ^
>include/linux/dynamic_debug.h:79:10: note: in definition of macro 'dynamic_pr_debug'
>        ##__VA_ARGS__);  \
>          ^
>include/linux/ceph/ceph_debug.h:17:2: note: in expansion of macro 'pr_debug'
>  pr_debug("%.*s %12.12s:%-4d : " fmt,    \
>  ^
>fs/ceph/file.c:420:2: note: in expansion of macro 'dout'
>  dout("sync_read on file %p %llu~%u %s\n", file, off,
>  ^
>fs/ceph/file.c:430:17: error: 'struct kiocb' has no member named 'ki_left'
>       off + iocb->ki_left);
>                 ^
>fs/ceph/file.c:436:25: error: 'struct iov_iter' has no member named 'iov'
>    void __user *data = i->iov[0].iov_base + i->iov_offset;
>                         ^
>fs/ceph/file.c:437:18: error: 'struct iov_iter' has no member named 'iov'
>    size_t len = i->iov[0].iov_len - i->iov_offset;
>                  ^
>fs/ceph/file.c:458:20: error: 'struct kiocb' has no member named 'ki_left'
>   size_t len = iocb->ki_left;
>                    ^
>fs/ceph/file.c:471:26: error: 'struct iov_iter' has no member named 'iov'
>     void __user *data = i->iov[0].iov_base
>                          ^
>In file included from include/linux/cache.h:4:0,
>                 from include/linux/time.h:4,
>                 from include/linux/stat.h:18,
>                 from include/linux/module.h:10,
>                 from fs/ceph/file.c:3:
>fs/ceph/file.c:473:14: error: 'struct iov_iter' has no member named 'iov'
>     l = min(i->iov[0].iov_len - i->iov_offset,
>              ^
>include/linux/kernel.h:670:9: note: in definition of macro 'min'
>  typeof(x) _min1 = (x);   \
>         ^
>fs/ceph/file.c:473:14: error: 'struct iov_iter' has no member named 'iov'
>     l = min(i->iov[0].iov_len - i->iov_offset,
>              ^
>include/linux/kernel.h:670:21: note: in definition of macro 'min'
>  typeof(x) _min1 = (x);   \
>                     ^
>include/linux/kernel.h:672:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
>  (void) (&_min1 == &_min2);  \
>                 ^
>fs/ceph/file.c:473:9: note: in expansion of macro 'min'
>     l = min(i->iov[0].iov_len - i->iov_offset,
>         ^
>fs/ceph/file.c:496:7: error: 'struct kiocb' has no member named 'ki_left'
>   iocb->ki_left -= ret;
>       ^
>fs/ceph/file.c: In function 'ceph_sync_direct_write':
>fs/ceph/file.c:588:24: error: 'struct iov_iter' has no member named 'iov'
>   void __user *data = i.iov->iov_base + i.iov_offset;
>                        ^
>fs/ceph/file.c:589:14: error: 'struct iov_iter' has no member named 'iov'
>   u64 len = i.iov->iov_len - i.iov_offset;
>              ^
>fs/ceph/file.c: In function 'ceph_aio_read':
>fs/ceph/file.c:839:7: error: 'struct kiocb' has no member named 'ki_left'
>   iocb->ki_left = len;
>       ^
>fs/ceph/file.c:870:8: error: 'struct kiocb' has no member named 'ki_left'
>    iocb->ki_left) {
>        ^
>
>Caused by commit e6c9af8b8f11 ("ceph: implement readv/preadv for sync
>operation").  ki_left was removed by commit 73a7075e3f6e ("aio: Kill
>aio_rw_vect_retry()") during the merge window ... basing new work for
>v3.13 on v3.11 is a bit problematic.
>
>I have used the ceph tree from next-20130925 for today.
>
>-- 
>Cheers,
>Stephen Rothwell                    sfr@canb.auug.org.au
>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* linux-next: build failure after merge of the ceph tree
@ 2013-09-26  1:15 Stephen Rothwell
  2013-09-26  1:20 ` majianpeng
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2013-09-26  1:15 UTC (permalink / raw)
  To: Sage Weil
  Cc: linux-next, linux-kernel, majianpeng, Kent Overstreet, Benjamin LaHaise

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

Hi Sage,

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

In file included from include/linux/kernel.h:14:0,
                 from include/linux/cache.h:4,
                 from include/linux/time.h:4,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from fs/ceph/file.c:3:
fs/ceph/file.c: In function 'ceph_sync_read':
fs/ceph/file.c:421:21: error: 'struct kiocb' has no member named 'ki_left'
       (unsigned)iocb->ki_left,
                     ^
include/linux/dynamic_debug.h:79:10: note: in definition of macro 'dynamic_pr_debug'
        ##__VA_ARGS__);  \
          ^
include/linux/ceph/ceph_debug.h:17:2: note: in expansion of macro 'pr_debug'
  pr_debug("%.*s %12.12s:%-4d : " fmt,    \
  ^
fs/ceph/file.c:420:2: note: in expansion of macro 'dout'
  dout("sync_read on file %p %llu~%u %s\n", file, off,
  ^
fs/ceph/file.c:430:17: error: 'struct kiocb' has no member named 'ki_left'
       off + iocb->ki_left);
                 ^
fs/ceph/file.c:436:25: error: 'struct iov_iter' has no member named 'iov'
    void __user *data = i->iov[0].iov_base + i->iov_offset;
                         ^
fs/ceph/file.c:437:18: error: 'struct iov_iter' has no member named 'iov'
    size_t len = i->iov[0].iov_len - i->iov_offset;
                  ^
fs/ceph/file.c:458:20: error: 'struct kiocb' has no member named 'ki_left'
   size_t len = iocb->ki_left;
                    ^
fs/ceph/file.c:471:26: error: 'struct iov_iter' has no member named 'iov'
     void __user *data = i->iov[0].iov_base
                          ^
In file included from include/linux/cache.h:4:0,
                 from include/linux/time.h:4,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from fs/ceph/file.c:3:
fs/ceph/file.c:473:14: error: 'struct iov_iter' has no member named 'iov'
     l = min(i->iov[0].iov_len - i->iov_offset,
              ^
include/linux/kernel.h:670:9: note: in definition of macro 'min'
  typeof(x) _min1 = (x);   \
         ^
fs/ceph/file.c:473:14: error: 'struct iov_iter' has no member named 'iov'
     l = min(i->iov[0].iov_len - i->iov_offset,
              ^
include/linux/kernel.h:670:21: note: in definition of macro 'min'
  typeof(x) _min1 = (x);   \
                     ^
include/linux/kernel.h:672:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
  (void) (&_min1 == &_min2);  \
                 ^
fs/ceph/file.c:473:9: note: in expansion of macro 'min'
     l = min(i->iov[0].iov_len - i->iov_offset,
         ^
fs/ceph/file.c:496:7: error: 'struct kiocb' has no member named 'ki_left'
   iocb->ki_left -= ret;
       ^
fs/ceph/file.c: In function 'ceph_sync_direct_write':
fs/ceph/file.c:588:24: error: 'struct iov_iter' has no member named 'iov'
   void __user *data = i.iov->iov_base + i.iov_offset;
                        ^
fs/ceph/file.c:589:14: error: 'struct iov_iter' has no member named 'iov'
   u64 len = i.iov->iov_len - i.iov_offset;
              ^
fs/ceph/file.c: In function 'ceph_aio_read':
fs/ceph/file.c:839:7: error: 'struct kiocb' has no member named 'ki_left'
   iocb->ki_left = len;
       ^
fs/ceph/file.c:870:8: error: 'struct kiocb' has no member named 'ki_left'
    iocb->ki_left) {
        ^

Caused by commit e6c9af8b8f11 ("ceph: implement readv/preadv for sync
operation").  ki_left was removed by commit 73a7075e3f6e ("aio: Kill
aio_rw_vect_retry()") during the merge window ... basing new work for
v3.13 on v3.11 is a bit problematic.

I have used the ceph tree from next-20130925 for today.

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

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: linux-next: build failure after merge of the ceph tree
  2012-03-21  1:40 Stephen Rothwell
@ 2012-03-21  4:24 ` Alex Elder
  0 siblings, 0 replies; 12+ messages in thread
From: Alex Elder @ 2012-03-21  4:24 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Sage Weil, linux-next, linux-kernel, Josh Durgin

On 03/20/2012 08:40 PM, Stephen Rothwell wrote:
> Hi Sage,
>
> After merging the ceph tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/block/rbd.c: In function 'rbd_add':
> drivers/block/rbd.c:2384:2: error: 'struct rbd_image_header' has no member named 'snap_rwsem'
>
> Caused by commit dd2a081fb58f ("rbd: move snap_rwsem to the device,
> rename to header_rwsem") interacting with commit 0e805a1d8577 ("rbd:
> initialize snap_rwsem in rbd_add()") from Linus' tree.
>
> I used the ceph tree from next-20120320 for today.

I'll take a look at this tomorrow.  I'm sorry my earlier
suggestion didn't address this.

					-Alex

^ permalink raw reply	[flat|nested] 12+ messages in thread

* linux-next: build failure after merge of the ceph tree
@ 2012-03-21  1:40 Stephen Rothwell
  2012-03-21  4:24 ` Alex Elder
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2012-03-21  1:40 UTC (permalink / raw)
  To: Sage Weil; +Cc: linux-next, linux-kernel, Josh Durgin, Alex Elder

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

Hi Sage,

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

drivers/block/rbd.c: In function 'rbd_add':
drivers/block/rbd.c:2384:2: error: 'struct rbd_image_header' has no member named 'snap_rwsem'

Caused by commit dd2a081fb58f ("rbd: move snap_rwsem to the device,
rename to header_rwsem") interacting with commit 0e805a1d8577 ("rbd:
initialize snap_rwsem in rbd_add()") from Linus' tree.

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

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: linux-next: build failure after merge of the ceph tree
  2010-11-16 23:43 Stephen Rothwell
@ 2010-11-17  0:02 ` Sage Weil
  0 siblings, 0 replies; 12+ messages in thread
From: Sage Weil @ 2010-11-17  0:02 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

On Wed, 17 Nov 2010, Stephen Rothwell wrote:
> Hi Sage,
> 
> After merging the ceph tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "ceph_str_hash" [fs/ceph/ceph.ko] undefined!
> 
> Caused by commit 5f69106b3f68be20015d1d8a43192bc2f14c7046 ("ceph: add
> dir_layout to inode").
> 
> I have used the ceph tree from next-20101116 for today.

I've added the missing EXPORT_SYMBOL and pushed a new for-next.

Thanks!
sage

^ permalink raw reply	[flat|nested] 12+ messages in thread

* linux-next: build failure after merge of the ceph tree
@ 2010-11-16 23:43 Stephen Rothwell
  2010-11-17  0:02 ` Sage Weil
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2010-11-16 23:43 UTC (permalink / raw)
  To: Sage Weil; +Cc: linux-next, linux-kernel

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

Hi Sage,

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

ERROR: "ceph_str_hash" [fs/ceph/ceph.ko] undefined!

Caused by commit 5f69106b3f68be20015d1d8a43192bc2f14c7046 ("ceph: add
dir_layout to inode").

I have used the ceph tree from next-20101116 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 --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: linux-next: build failure after merge of the ceph tree
  2010-09-20  1:41 Stephen Rothwell
@ 2010-09-20  2:53 ` Sage Weil
  0 siblings, 0 replies; 12+ messages in thread
From: Sage Weil @ 2010-09-20  2:53 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Greg Farnum

On Mon, 20 Sep 2010, Stephen Rothwell wrote:
> Hi Sage,
> 
> After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> net/ceph/pagelist.c: In function 'ceph_pagelist_truncate':
> net/ceph/pagelist.c:136: error: implicit declaration of function 'pagelist_unmap_tail'
> 
> Caused by commit d73f8eefea20406cba00b80a65747844df120559 ("ceph: add pagelist_reserve, pagelist_truncate, pagelist_set_cursor").
> 
> I have used the version of the ceph tree from next-20100917 for today.

Fixed.  Thanks!

sage

^ permalink raw reply	[flat|nested] 12+ messages in thread

* linux-next: build failure after merge of the ceph tree
@ 2010-09-20  1:41 Stephen Rothwell
  2010-09-20  2:53 ` Sage Weil
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2010-09-20  1:41 UTC (permalink / raw)
  To: Sage Weil; +Cc: linux-next, linux-kernel, Greg Farnum

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

Hi Sage,

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

net/ceph/pagelist.c: In function 'ceph_pagelist_truncate':
net/ceph/pagelist.c:136: error: implicit declaration of function 'pagelist_unmap_tail'

Caused by commit d73f8eefea20406cba00b80a65747844df120559 ("ceph: add pagelist_reserve, pagelist_truncate, pagelist_set_cursor").

I have used the version of the ceph tree from next-20100917 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 --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2020-12-14 23:47 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-27  1:31 linux-next: build failure after merge of the ceph tree Stephen Rothwell
2013-09-27  2:36 ` Dave Kleikamp
  -- strict thread matches above, loose matches on Subject: below --
2020-12-14 23:46 Stephen Rothwell
2013-09-26  1:15 Stephen Rothwell
2013-09-26  1:20 ` majianpeng
2013-09-26  1:26   ` Sage Weil
2012-03-21  1:40 Stephen Rothwell
2012-03-21  4:24 ` Alex Elder
2010-11-16 23:43 Stephen Rothwell
2010-11-17  0:02 ` Sage Weil
2010-09-20  1:41 Stephen Rothwell
2010-09-20  2:53 ` Sage Weil

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).