From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Apr 2020 04:51:14 +0000 (-0700)
Subject: Merge tag '9p-for-5.7-2' of git://github.com/martinetd/linux
X-Git-Tag: v5.7-rc1~38
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5d30bcacd91af6874481129797af364a53cd9b46;p=users%2Fhch%2Fconfigfs.git

Merge tag '9p-for-5.7-2' of git://github.com/martinetd/linux

Pull 9p documentation update from Dominique Martinet:
 "Document the new O_NONBLOCK short read behavior"

* tag '9p-for-5.7-2' of git://github.com/martinetd/linux:
  9p: document short read behaviour with O_NONBLOCK
---

5d30bcacd91af6874481129797af364a53cd9b46
diff --cc Documentation/filesystems/9p.rst
index f054d1c45e86,3fb780ffdf23..671fef39a802
--- 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: