Merge tag '9p-for-5.11-rc1' of git://github.com/martinetd/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Dec 2020 18:28:02 +0000 (10:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Dec 2020 18:28:02 +0000 (10:28 -0800)
Pull 9p update from Dominique Martinet:

 - fix long-standing limitation on open-unlink-fop pattern

 - add refcount to p9_fid (fixes the above and will allow for more
   cleanups and simplifications in the future)

* tag '9p-for-5.11-rc1' of git://github.com/martinetd/linux:
  9p: Remove unnecessary IS_ERR() check
  9p: Uninitialized variable in v9fs_writeback_fid()
  9p: Fix writeback fid incorrectly being attached to dentry
  9p: apply review requests for fid refcounting
  9p: add refcount to p9_fid struct
  fs/9p: search open fids first
  fs/9p: track open fids
  fs/9p: fix create-unlink-getattr idiom

1  2 
fs/9p/vfs_file.c
net/9p/client.c

Simple merge
diff --cc net/9p/client.c
Simple merge