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

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

[Stephen Rothwell]

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

Hi Jens,

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

drivers/staging/lustre/lustre/llite/llite_lib.c: In function 'll_read_inode2':
drivers/staging/lustre/lustre/llite/llite_lib.c:1774:18: error: 'struct address_space' has no member named 'backing_dev_info'
  inode->i_mapping->backing_dev_info = &s2lsi(inode->i_sb)->lsi_bdi;
                  ^

Caused by commit b83ae6d42143 ("fs: remove mapping->backing_dev_info")
not updating the lustre code in the staging tree.

I have disabled the lustre code for today using the following.  Please
let me know if you fix the lustre code so that I can reenable it.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Jan 2015 14:36:21 +1100
Subject: [PATCH] disable the lustre code for now

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/staging/lustre/lustre/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/lustre/lustre/Kconfig b/drivers/staging/lustre/lustre/Kconfig
index 6725467ef4d0..37dd33f6597e 100644
--- a/drivers/staging/lustre/lustre/Kconfig
+++ b/drivers/staging/lustre/lustre/Kconfig
@@ -1,6 +1,7 @@
 config LUSTRE_FS
 	tristate "Lustre file system client support"
 	depends on INET && m && !MIPS && !XTENSA && !SUPERH
+	depends on BROKEN
 	select LNET
 	select CRYPTO
 	select CRYPTO_CRC32
-- 
2.1.4

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

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

[PATCH] staging/lustre/llite: get rid of backing_dev_info

[green]

From: Oleg Drokin <green@linuxhacker.ru>

With removal of backing_dev_info from struct address_space,
we don't need to assign it in Lustre either.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
---
 drivers/staging/lustre/lustre/llite/llite_lib.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index d5b149c..45aaa1c 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -1812,10 +1812,6 @@ void ll_read_inode2(struct inode *inode, void *opaque)
 
 	/* OIDEBUG(inode); */
 
-	/* initializing backing dev info. */
-	inode->i_mapping->backing_dev_info = &s2lsi(inode->i_sb)->lsi_bdi;
-
-
 	if (S_ISREG(inode->i_mode)) {
 		struct ll_sb_info *sbi = ll_i2sbi(inode);
 
-- 
2.1.0

Re: [PATCH] staging/lustre/llite: get rid of backing_dev_info

[Jens Axboe]

On 01/21/2015 01:10 AM, green@linuxhacker.ru wrote:
> From: Oleg Drokin <green@linuxhacker.ru>
>
> With removal of backing_dev_info from struct address_space,
> we don't need to assign it in Lustre either.

Thanks Oleg, applied. Stephen, you should be able to drop the BROKEN 
lustre patch again.

-- 
Jens Axboe

Re: [PATCH] staging/lustre/llite: get rid of backing_dev_info

[Stephen Rothwell]

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

Hi Jens,

On Wed, 21 Jan 2015 10:41:00 -0700 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 01/21/2015 01:10 AM, green@linuxhacker.ru wrote:
> > From: Oleg Drokin <green@linuxhacker.ru>
> >
> > With removal of backing_dev_info from struct address_space,
> > we don't need to assign it in Lustre either.
> 
> Thanks Oleg, applied. Stephen, you should be able to drop the BROKEN 
> lustre patch again.

Will do, thanks.

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

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