Merge tag 'nfsd-4.21' 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 f093fbe471338b06a2d544ebe00983cb065968fa..fb3c9844c82ae2ea1b7e7709cc48a8da3ae307c1 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -238,7 +238,7 @@ find_blocked_lock(struct nfs4_lockowner *lo, struct knfsd_fh *fh,
        }
        spin_unlock(&nn->blocked_locks_lock);
        if (found)
-               posix_unblock_lock(&found->nbl_lock);
+               locks_delete_block(&found->nbl_lock);
        return found;
 }
 
@@ -293,7 +293,7 @@ remove_blocked_locks(struct nfs4_lockowner *lo)
                nbl = list_first_entry(&reaplist, struct nfsd4_blocked_lock,
                                        nbl_lru);
                list_del_init(&nbl->nbl_lru);
-               posix_unblock_lock(&nbl->nbl_lock);
+               locks_delete_block(&nbl->nbl_lock);
                free_blocked_lock(nbl);
        }
 }
@@ -4863,7 +4863,7 @@ nfs4_laundromat(struct nfsd_net *nn)
                nbl = list_first_entry(&reaplist,
                                        struct nfsd4_blocked_lock, nbl_lru);
                list_del_init(&nbl->nbl_lru);
-               posix_unblock_lock(&nbl->nbl_lock);
+               locks_delete_block(&nbl->nbl_lock);
                free_blocked_lock(nbl);
        }
 out:
@@ -5112,7 +5112,7 @@ nfs4_find_file(struct nfs4_stid *s, int flags)
 }
 
 static __be32
-nfs4_check_olstateid(struct svc_fh *fhp, struct nfs4_ol_stateid *ols, int flags)
+nfs4_check_olstateid(struct nfs4_ol_stateid *ols, int flags)
 {
        __be32 status;
 
@@ -5195,7 +5195,7 @@ nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,
                break;
        case NFS4_OPEN_STID:
        case NFS4_LOCK_STID:
-               status = nfs4_check_olstateid(fhp, openlockstateid(s), flags);
+               status = nfs4_check_olstateid(openlockstateid(s), flags);
                break;
        default:
                status = nfserr_bad_stateid;
@@ -6230,15 +6230,15 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                case NFS4_READ_LT:
                case NFS4_READW_LT:
                        file_lock->fl_type = F_RDLCK;
-               break;
+                       break;
                case NFS4_WRITE_LT:
                case NFS4_WRITEW_LT:
                        file_lock->fl_type = F_WRLCK;
-               break;
+                       break;
                default:
                        dprintk("NFSD: nfs4_lockt: bad lock type!\n");
                        status = nfserr_inval;
-               goto out;
+                       goto out;
        }
 
        lo = find_lockowner_str(cstate->clp, &lockt->lt_owner);