linux-next: manual merge of the v9fs tree with Linus' tree

linux-next: manual merge of the v9fs tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the v9fs tree got a conflict in:

  Documentation/filesystems/9p.rst

between commit:

  07d241fd66ba ("docs: filesystems: convert 9p.txt to ReST")

from Linus' tree and commit:

  c6f141412d24 ("9p: document short read behaviour with O_NONBLOCK")

from the v9fs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/filesystems/9p.rst
index f054d1c45e86,3fb780ffdf23..000000000000
--- a/Documentation/filesystems/9p.rst
+++ b/Documentation/filesystems/9p.rst
@@@ -156,9 -132,18 +156,19 @@@ Option
    cachetag	cache tag to use the specified persistent cache.
  		cache tags for existing cache sessions can be listed at
  		/sys/fs/9p/caches. (applies only to cache=fscache)
 +  ============= ===============================================================
  
 -BEHAVIOR
++Behavior
+ ========
+ 
+ This section aims at describing 9p 'quirks' that can be different
+ from a local filesystem behaviors.
+ 
+  - Setting O_NONBLOCK on a file will make client reads return as early
+    as the server returns some data instead of trying to fill the read
+    buffer with the requested amount of bytes or end of file is reached.
+ 
 -RESOURCES
 +Resources
  =========
  
  Protocol specifications are maintained on github:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the v9fs tree with Linus' tree

[Stephen Rothwell]

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;