Merge tag 'nfsd-5.16' of git://linux-nfs.org/~bfields/linux

[sfrench/cifs-2.6.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3f4027a5de8834d9b9641fc81723958fb24de954..bfad94c70b84bcb0b95e55504dfd9c76e5d25d0f 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1010,7 +1010,7 @@ static int delegation_blocked(struct knfsd_fh *fh)
                }
                spin_unlock(&blocked_delegations_lock);
        }
-       hash = jhash(&fh->fh_base, fh->fh_size, 0);
+       hash = jhash(&fh->fh_raw, fh->fh_size, 0);
        if (test_bit(hash&255, bd->set[0]) &&
            test_bit((hash>>8)&255, bd->set[0]) &&
            test_bit((hash>>16)&255, bd->set[0]))
@@ -1029,7 +1029,7 @@ static void block_delegations(struct knfsd_fh *fh)
        u32 hash;
        struct bloom_pair *bd = &blocked_delegations;
 
-       hash = jhash(&fh->fh_base, fh->fh_size, 0);
+       hash = jhash(&fh->fh_raw, fh->fh_size, 0);
 
        spin_lock(&blocked_delegations_lock);
        __set_bit(hash&255, bd->set[bd->new]);
@@ -5541,7 +5541,7 @@ static void nfsd4_ssc_shutdown_umount(struct nfsd_net *nn)
 static void nfsd4_ssc_expire_umount(struct nfsd_net *nn)
 {
        bool do_wakeup = false;
-       struct nfsd4_ssc_umount_item *ni = 0;
+       struct nfsd4_ssc_umount_item *ni = NULL;
        struct nfsd4_ssc_umount_item *tmp;
 
        spin_lock(&nn->nfsd_ssc_lock);