diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-06 08:46:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-06 08:46:59 -0700 |
| commit | e14679b62d84b8ab9136189fc069d389da43fe71 (patch) | |
| tree | 2a5d7a12c6b73eaab7693ca299835f98f1549a24 /fs/9p/vfs_inode.c | |
| parent | 77a73eecd47c2c290cf4ecba2c5b9d26d5d812be (diff) | |
| parent | 43657496e46672fe63bccc1fcfb5b68de6e1e2f4 (diff) | |
| download | linux-stable-e14679b62d84b8ab9136189fc069d389da43fe71.tar.gz linux-stable-e14679b62d84b8ab9136189fc069d389da43fe71.tar.bz2 linux-stable-e14679b62d84b8ab9136189fc069d389da43fe71.zip | |
Merge tag '9p-for-5.7' of git://github.com/martinetd/linux
Pull 9p updates from Dominique Martinet:
"Not much new, but a few patches for this cycle:
- Fix read with O_NONBLOCK to allow incomplete read and return
immediately
- Rest is just cleanup (indent, unused field in struct, extra
semicolon)"
* tag '9p-for-5.7' of git://github.com/martinetd/linux:
net/9p: remove unused p9_req_t aux field
9p: read only once on O_NONBLOCK
9pnet: allow making incomplete read requests
9p: Remove unneeded semicolon
9p: Fix Kconfig indentation
Diffstat (limited to 'fs/9p/vfs_inode.c')
| -rw-r--r-- | fs/9p/vfs_inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index b82423a72f68..c9255d399917 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -143,7 +143,7 @@ static umode_t p9mode2unixmode(struct v9fs_session_info *v9ses, default: p9_debug(P9_DEBUG_ERROR, "Unknown special type %c %s\n", type, stat->extension); - }; + } *rdev = MKDEV(major, minor); } else res |= S_IFREG; |