From: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sripathi Kodi <sripathik@in•ibm.com>, Tejun Heo <tj@kernel•org>,
Eric Van Hensbergen <ericvh@gmail•com>,
Jens Axboe <jens.axboe@oracle•com>
Subject: linux-next: manual merge of the v9fs tree with Linus' tree
Date: Thu, 29 Apr 2010 11:21:53 +1000 [thread overview]
Message-ID: <20100429112153.6fe79961.sfr@canb.auug.org.au> (raw)
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@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;
next reply other threads:[~2010-04-29 1:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-29 1:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-09 1:03 linux-next: manual merge of the v9fs tree with Linus' tree 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=20100429112153.6fe79961.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ericvh@gmail$(echo .)com \
--cc=jens.axboe@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sripathik@in$(echo .)ibm.com \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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