mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Peter Zijlstra <peterz@infradead.org>,
	Sage Weil <sage@newdream.net>,
	Wu Fengguang <fengguang.wu@intel.com>
Subject: linux-next: nfs/ceph tree build failure
Date: Fri, 8 Jan 2010 11:11:36 +1100	[thread overview]
Message-ID: <20100108111136.3feae8c6.sfr@canb.auug.org.au> (raw)

Hi all,

Today's linux-next build (x86_64 allmodconfig) failed like this:

fs/ceph/addr.c: In function 'ceph_set_page_dirty':
fs/ceph/addr.c:105: error: 'BDI_RECLAIMABLE' undeclared (first use in this function)

Commit 69f0302c4bd28846c3251e25976a2336cd6a6e6f ("VM: Split out the
accounting of unstable writes from BDI_RECLAIMABLE") from the nfs tree
interacts with commit 1d3576fd10f0d7a104204267b81cf84a07028dad ("ceph:
address space operations") from the ceph tree.

I applied the following patch for today (I am not sure it is correct) and
will keep it as a merge fixup as necessary.

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Jan 2010 11:04:27 +1100
Subject: [PATCH] ceph: update for BDI_RECLAIMABLE change

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

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index bf53581..eab46b0 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -101,8 +101,7 @@ static int ceph_set_page_dirty(struct page *page)
 
 		if (mapping_cap_account_dirty(mapping)) {
 			__inc_zone_page_state(page, NR_FILE_DIRTY);
-			__inc_bdi_stat(mapping->backing_dev_info,
-					BDI_RECLAIMABLE);
+			__inc_bdi_stat(mapping->backing_dev_info, BDI_DIRTY);
 			task_io_account_write(PAGE_CACHE_SIZE);
 		}
 		radix_tree_tag_set(&mapping->page_tree,
-- 
1.6.5.7


             reply	other threads:[~2010-01-08  0:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-08  0:11 Stephen Rothwell [this message]
2010-01-08  0:18 ` Trond Myklebust
2010-01-08  1:19   ` Stephen Rothwell
2010-01-08  4:51     ` Sage Weil
2010-01-08  5:16       ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100108111136.3feae8c6.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=fengguang.wu@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=sage@newdream.net \
    --cc=trond.myklebust@fys.uio.no \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®