Commit e3b862ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '9p-for-6.2-rc1' of https://github.com/martinetd/linux 

Pull 9p updates from Dominique Martinet:

 - improve p9_check_errors to check buffer size instead of msize when
   possible (e.g. not zero-copy)

 - some more syzbot and KCSAN fixes

 - minor headers include cleanup

* tag '9p-for-6.2-rc1' of https://github.com/martinetd/linux:
  9p/client: fix data race on req->status
  net/9p: fix response size check in p9_check_errors()
  net/9p: distinguish zero-copy requests
  9p/xen: do not memcpy header into req->rc
  9p: set req refcount to zero to avoid uninitialized usage
  9p/net: Remove unneeded idr.h #include
  9p/fs: Remove unneeded idr.h #include
parents a27405b2 1a4f69ef

fs/9p/fid.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/fs.h>

#include <linux/slab.h>

#include <linux/sched.h>

#include <linux/idr.h>

#include <net/9p/9p.h>

#include <net/9p/client.h>

fs/9p/v9fs.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/sched.h>

#include <linux/cred.h>

#include <linux/parser.h>

#include <linux/idr.h>

#include <linux/slab.h>

#include <linux/seq_file.h>

#include <net/9p/9p.h>

fs/9p/vfs_addr.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/string.h>

#include <linux/inet.h>

#include <linux/pagemap.h>

#include <linux/idr.h>

#include <linux/sched.h>

#include <linux/swap.h>

#include <linux/uio.h>

fs/9p/vfs_dentry.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/string.h>

#include <linux/inet.h>

#include <linux/namei.h>

#include <linux/idr.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <net/9p/9p.h>

fs/9p/vfs_dir.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/string.h>

#include <linux/sched.h>

#include <linux/inet.h>

#include <linux/idr.h>

#include <linux/slab.h>

#include <linux/uio.h>

#include <linux/fscache.h>