linux-next: manual merge of the ceph tree with Linus' tree
in [Kernel]
|
Prev: drivers/platform/x86: Use kzalloc
Next: ftrace syscalls: Allow arch specific syscall symbol matching
From: Stephen Rothwell on 13 May 2010 20:10 Hi Sage, Today's linux-next merge of the ceph tree got a conflict in fs/ceph/super.c between commit 5dfc589a8467470226feccdc50f1b32713318e7b ("ceph: unregister bdi before kill_anon_super releases device name") from Linus' tree and commits 9f2a2a1faa0fd990d4930605583a67d7dff28bff ("ceph: use ceph_sb_to_client instead of ceph_client") and c72b09ba224e6f2c00bcf810a0a62059fcf405f7 ("ceph: name bdi ceph-%d instead of major:minor") from the ceph tree. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc fs/ceph/super.c index 110857b,30fa891..0000000 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@@ -8,14 -8,10 +8,11 @@@ #include <linux/module.h> #include <linux/mount.h> #include <linux/parser.h> - #include <linux/rwsem.h> #include <linux/sched.h> #include <linux/seq_file.h> +#include <linux/slab.h> #include <linux/statfs.h> #include <linux/string.h> - #include <linux/version.h> - #include <linux/vmalloc.h> #include "decode.h" #include "super.h" @@@ -893,9 -910,8 +921,10 @@@ static int ceph_register_bdi(struct sup client->backing_dev_info.ra_pages = (client->mount_args->rsize + PAGE_CACHE_SIZE - 1) >> PAGE_SHIFT; - err = bdi_register_dev(&client->backing_dev_info, sb->s_dev); + err = bdi_register(&client->backing_dev_info, NULL, "ceph-%d", + atomic_long_inc_return(&bdi_seq)); + if (!err) + sb->s_bdi = &client->backing_dev_info; return err; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Sage Weil on 14 May 2010 00:30 Hi Stephen, On Fri, 14 May 2010, Stephen Rothwell wrote: > Hi Sage, > > Today's linux-next merge of the ceph tree got a conflict in > fs/ceph/super.c between commit 5dfc589a8467470226feccdc50f1b32713318e7b > ("ceph: unregister bdi before kill_anon_super releases device name") from > Linus' tree and commits 9f2a2a1faa0fd990d4930605583a67d7dff28bff ("ceph: > use ceph_sb_to_client instead of ceph_client") and > c72b09ba224e6f2c00bcf810a0a62059fcf405f7 ("ceph: name bdi ceph-%d instead > of major:minor") from the ceph tree. Aie, sorry... I rebased everything queued for the next window yesterday but forgot to update the for-next tag. These conflicts should all disappear next time around. Thanks! sage -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 14 May 2010 02:10
Hi Sage, On Thu, 13 May 2010 21:25:45 -0700 (PDT) Sage Weil <sage(a)newdream.net> wrote: > > Aie, sorry... I rebased everything queued for the next window yesterday > but forgot to update the for-next tag. These conflicts should all > disappear next time around. Thanks. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |