diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2022-10-07 00:47:03 +0200 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2022-10-07 00:48:45 +0200 |
| commit | 33331a728c83f380e53a3dbf2be0c1893da1d739 (patch) | |
| tree | 236d3bde9840b641723467018b839c7f37a824ee /fs/cachefiles/internal.h | |
| parent | RDMA/rxe: Remove error/warning messages from packet receiver path (diff) | |
| parent | Linux 6.0 (diff) | |
| download | linux-33331a728c83f380e53a3dbf2be0c1893da1d739.tar.xz linux-33331a728c83f380e53a3dbf2be0c1893da1d739.zip | |
Merge tag 'v6.0' into rdma.git for-next
Trvial merge conflicts against rdma.git for-rc resolved matching
linux-next:
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
drivers/infiniband/hw/hns/hns_roce_main.c
https://lore.kernel.org/r/20220929124005.105149-1-broonie@kernel.org
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'fs/cachefiles/internal.h')
| -rw-r--r-- | fs/cachefiles/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h index 6cba2c6de2f9..2ad58c465208 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h @@ -111,6 +111,7 @@ struct cachefiles_cache { char *tag; /* cache binding tag */ refcount_t unbind_pincount;/* refcount to do daemon unbind */ struct xarray reqs; /* xarray of pending on-demand requests */ + unsigned long req_id_next; struct xarray ondemand_ids; /* xarray for ondemand_id allocation */ u32 ondemand_id_next; }; |