Merge tag 'pull-file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs file updates from Al Viro:
 "struct file-related stuff"

* tag 'pull-file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  dma_buf_getfile(): don't bother with ->f_flags reassignments
  Change calling conventions for filldir_t
  locks: fix TOCTOU race when granting write lease

diff --cc arch/alpha/kernel/osf_sys.c
Simple merge

diff --cc drivers/dma-buf/dma-buf.c
Simple merge

diff --cc fs/internal.h
Simple merge

diff --cc fs/ksmbd/smb2pdu.c
Simple merge

diff --cc fs/nfsd/nfs4recover.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc fs/open.c
Simple merge

diff --cc include/linux/fs.h
Simple merge