Merge tag 'nfs-for-5.17-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[sfrench/cifs-2.6.git] / include / linux / nfs_fs_sb.h

diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 8c08b356c8ca64f34f0cb524e5bb21ba96ee14ac..ca0959e51e817cfd5002d79200da255077f85811 100644 (file)
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -120,11 +120,6 @@ struct nfs_client {
         * This is used to generate the mv0 callback address.
         */
        char                    cl_ipaddr[48];
-
-#ifdef CONFIG_NFS_FSCACHE
-       struct fscache_cookie   *fscache;       /* client index cache cookie */
-#endif
-
        struct net              *cl_net;
        struct list_head        pending_cb_stateids;
 };
@@ -194,8 +189,8 @@ struct nfs_server {
        struct nfs_auth_info    auth_info;      /* parsed auth flavors */
 
 #ifdef CONFIG_NFS_FSCACHE
-       struct nfs_fscache_key  *fscache_key;   /* unique key for superblock */
-       struct fscache_cookie   *fscache;       /* superblock cookie */
+       struct fscache_volume   *fscache;       /* superblock cookie */
+       char                    *fscache_uniq;  /* Uniquifier (or NULL) */
 #endif
 
        u32                     pnfs_blksize;   /* layout_blksize attr */