Merge tag 'rtc-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[linux-block.git] / include / linux / nfs_xdr.h

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 728cb0c1f0b6da7b274c8bdb560807956d63cd32..49ba486aea5fd831f707ed3bc5153814bbe394c0 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -745,8 +745,7 @@ struct nfs_auth_info {
  */
 struct nfs_entry {
        __u64                   ino;
-       __u64                   cookie,
-                               prev_cookie;
+       __u64                   cookie;
        const char *            name;
        unsigned int            len;
        int                     eof;
@@ -1798,6 +1797,8 @@ struct nfs_rpc_ops {
        struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *,
                                           struct nfs_fattr *, rpc_authflavor_t);
        int     (*discover_trunking)(struct nfs_server *, struct nfs_fh *);
+       void    (*enable_swap)(struct inode *inode);
+       void    (*disable_swap)(struct inode *inode);
 };
 
 /*