linux-next: vfs tree build warning

linux-next: vfs tree build warning

[Stephen Rothwell]

Hi Al,

Today's linux-next build (x86_64_allmodconfig) produced this warning:

fs/logfs/inode.c:399: warning: initialization from incompatible pointer type

Introduced by commit bc39e28236344af617473df80abb7de43176511e ("pass
writeback_control to ->write_inode") from the vfs tree interacting with
commit 5db53f3e80dee2d9dff5e534f9e9fe1db17c9936 ("[LogFS] add new flash
file system") from the logfs tree.

This will need a fixup patch (see below) which I can carry in the
linux-next tree.  There may, of course, be a better fix (which I can
carry if someone sends it to me).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Jan 2010 12:14:59 +1100
Subject: [PATCH] logfs: fixup for write_inode API change

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

diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c
index 6d08b37..36308af 100644
--- a/fs/logfs/inode.c
+++ b/fs/logfs/inode.c
@@ -8,6 +8,7 @@
 #include "logfs.h"
 #include <linux/writeback.h>
 #include <linux/backing-dev.h>
+#include <linux/writeback.h>
 
 /*
  * How soon to reuse old inode numbers?  LogFS doesn't store deleted inodes
@@ -282,7 +283,7 @@ struct inode *logfs_read_meta_inode(struct super_block *sb, u64 ino)
 	return inode;
 }
 
-static int logfs_write_inode(struct inode *inode, int do_sync)
+static int logfs_write_inode(struct inode *inode, struct writeback_control *wbc)
 {
 	int ret;
 	long flags = WF_LOCK;
-- 
1.6.6

linux-next: vfs tree build warning

[Stephen Rothwell]

Hi Al,

Today's linux-next build (x86_64_allmodconfig) produced this warning:

fs/ceph/super.c:216: warning: initialization from incompatible pointer type

Introduced by commit bc39e28236344af617473df80abb7de43176511e ("pass
writeback_control to ->write_inode") from the vfs tree interacting with
commit 16725b9d2a2e3d0fd2b0034482e2eb0a2d78050f ("ceph: super.c") from
the ceph tree.

This will need a fixup patch (see below) which I can carry in the
linux-next tree.  There may, of course, be a better fix (which I can
carry if someone sends it to me).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Jan 2010 11:53:08 +1100
Subject: [PATCH] ceph: update for write_inode API change

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

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 9b9ce14..b2a6b9a 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -5,6 +5,7 @@
 #include <linux/sched.h>
 #include <linux/vmalloc.h>
 #include <linux/wait.h>
+#include <linux/writeback.h>
 
 #include "super.h"
 #include "decode.h"
@@ -1745,12 +1746,13 @@ int ceph_fsync(struct file *file, struct dentry *dentry, int datasync)
  * get by with fewer MDS messages if we wait for data writeback to
  * complete first.
  */
-int ceph_write_inode(struct inode *inode, int wait)
+int ceph_write_inode(struct inode *inode, struct writeback_control *wbc)
 {
 	struct ceph_inode_info *ci = ceph_inode(inode);
 	unsigned flush_tid;
 	int err = 0;
 	int dirty;
+	int wait = wbc->sync_mode == WB_SYNC_ALL;
 
 	dout("write_inode %p wait=%d\n", inode, wait);
 	if (wait) {
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index de5e324..25b0988 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -11,6 +11,7 @@
 #include <linux/mempool.h>
 #include <linux/pagemap.h>
 #include <linux/wait.h>
+#include <linux/writeback.h>
 
 #include "types.h"
 #include "messenger.h"
@@ -806,7 +807,7 @@ static inline void ceph_remove_cap(struct ceph_cap *cap)
 }
 
 extern void ceph_queue_caps_release(struct inode *inode);
-extern int ceph_write_inode(struct inode *inode, int unused);
+extern int ceph_write_inode(struct inode *inode, struct writeback_control *wbc);
 extern int ceph_fsync(struct file *file, struct dentry *dentry, int datasync);
 extern void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc,
 				    struct ceph_mds_session *session);
-- 
1.6.6

Re: linux-next: vfs tree build warning

[Sage Weil]

On Mon, 18 Jan 2010, Stephen Rothwell wrote:
> Hi Al,
> 
> Today's linux-next build (x86_64_allmodconfig) produced this warning:
> 
> fs/ceph/super.c:216: warning: initialization from incompatible pointer type
> 
> Introduced by commit bc39e28236344af617473df80abb7de43176511e ("pass
> writeback_control to ->write_inode") from the vfs tree interacting with
> commit 16725b9d2a2e3d0fd2b0034482e2eb0a2d78050f ("ceph: super.c") from
> the ceph tree.
> 
> This will need a fixup patch (see below) which I can carry in the
> linux-next tree.  There may, of course, be a better fix (which I can
> carry if someone sends it to me).

I can put this in the for-next branch of the ceph tree.

Thanks-
sage

Re: linux-next: vfs tree build warning

[Stephen Rothwell]

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

Hi Sage,

On Sun, 17 Jan 2010 20:34:29 -0800 (PST) Sage Weil <sage@newdream.net> wrote:
>
> I can put this in the for-next branch of the ceph tree.

Not unless you first merge the vfs tree into the ceph tree ...

-- 
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: vfs tree build warning

[Al Viro]

On Mon, Jan 18, 2010 at 04:41:48PM +1100, Stephen Rothwell wrote:
> Hi Sage,
> 
> On Sun, 17 Jan 2010 20:34:29 -0800 (PST) Sage Weil <sage@newdream.net> wrote:
> >
> > I can put this in the for-next branch of the ceph tree.
> 
> Not unless you first merge the vfs tree into the ceph tree ...

Grr...  How about putting these two commits on a separate (and absolutely
unchanging) branch?  I'd rather live without being unable to rediff
for-next if needed and that way nfs, ceph, etc. could pull _that_ instead.

Re: linux-next: vfs tree build warning

[Jörn Engel]

On Mon, 18 January 2010 13:11:28 +1100, Stephen Rothwell wrote:
> 
> Today's linux-next build (x86_64_allmodconfig) produced this warning:
> 
> fs/logfs/inode.c:399: warning: initialization from incompatible pointer type
> 
> Introduced by commit bc39e28236344af617473df80abb7de43176511e ("pass
> writeback_control to ->write_inode") from the vfs tree interacting with
> commit 5db53f3e80dee2d9dff5e534f9e9fe1db17c9936 ("[LogFS] add new flash
> file system") from the logfs tree.
> 
> This will need a fixup patch (see below) which I can carry in the
> linux-next tree.  There may, of course, be a better fix (which I can
> carry if someone sends it to me).

Looks good enough for me for now.  Next week, after returning from
vacation, I'll have a closer look and update the logfs tree.

Thank you, Stephen!

Jörn

-- 
Joern's library part 7:
http://www.usenix.org/publications/library/proceedings/neworl/full_papers/mckusick.a

Re: linux-next: vfs tree build warning

[Stephen Rothwell]

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

Hi Jörn,

On Mon, 18 Jan 2010 15:34:15 +0100 Jörn Engel <joern@logfs.org> wrote:
>
> Looks good enough for me for now.  Next week, after returning from
> vacation, I'll have a closer look and update the logfs tree.

OK, thanks.

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

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