Prev: [tip:x86/asm] x86-64: Reduce SMP locks table size
Next: [tip:x86/cleanups] x86-64: Don't export init_level4_pgt
From: Stephen Rothwell on 28 Apr 2010 21:30
Hi Eric,

Today's linux-next merge of the v9fs tree got a conflict in
fs/9p/vfs_super.c between commits 5a0e3ad6af8660be21ca98a971cd00f331318c05
("include cleanup: Update gfp.h and slab.h includes to prepare for
breaking implicit slab.h inclusion from percpu.h") and
0ed07ddb56d1348e5ce33f3b8de20d730351983a ("9p: add bdi backing to mount
session") from Linus' tree and commits
0b2d973241f9bdbc8ed62caec42543e00ae6bd1e ("9p: VFS switches for 9p2000.L:
VFS switches") and a61a60e387303575629706279b3b0018e96a758a ("9p: add
9P2000.L statfs operation") from the v9fs 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/9p/vfs_super.c
index 806da5d,af2a620..0000000
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@@ -37,7 -37,7 +37,8 @@@
#include <linux/mount.h>
#include <linux/idr.h>
#include <linux/sched.h>
+#include <linux/slab.h>
+ #include <linux/statfs.h>
#include <net/9p/9p.h>
#include <net/9p/client.h>

@@@ -76,8 -76,10 +77,11 @@@ v9fs_fill_super(struct super_block *sb
sb->s_blocksize_bits = fls(v9ses->maxdata - 1);
sb->s_blocksize = 1 << sb->s_blocksize_bits;
sb->s_magic = V9FS_MAGIC;
- sb->s_op = &v9fs_super_ops;
+ if (v9fs_proto_dotl(v9ses))
+ sb->s_op = &v9fs_super_ops_dotl;
+ else
+ sb->s_op = &v9fs_super_ops;
+ sb->s_bdi = &v9ses->bdi;

sb->s_flags = flags | MS_ACTIVE | MS_SYNCHRONOUS | MS_DIRSYNC |
MS_NOATIME;
--
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/
 | 
Pages: 1
Prev: [tip:x86/asm] x86-64: Reduce SMP locks table size
Next: [tip:x86/cleanups] x86-64: Don't export init_level4_pgt