diff options
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 25bab6032dfe..611052bacaff 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -820,12 +820,10 @@ static void nfs4_free_closedata(struct nfs4_closedata *calldata) | |||
820 | { | 820 | { |
821 | struct nfs4_state *state = calldata->state; | 821 | struct nfs4_state *state = calldata->state; |
822 | struct nfs4_state_owner *sp = state->owner; | 822 | struct nfs4_state_owner *sp = state->owner; |
823 | struct nfs_server *server = NFS_SERVER(calldata->inode); | ||
824 | 823 | ||
825 | nfs4_put_open_state(calldata->state); | 824 | nfs4_put_open_state(calldata->state); |
826 | nfs_free_seqid(calldata->arg.seqid); | 825 | nfs_free_seqid(calldata->arg.seqid); |
827 | nfs4_put_state_owner(sp); | 826 | nfs4_put_state_owner(sp); |
828 | up_read(&server->nfs4_state->cl_sem); | ||
829 | kfree(calldata); | 827 | kfree(calldata); |
830 | } | 828 | } |
831 | 829 | ||
@@ -2758,7 +2756,6 @@ static int _nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock | |||
2758 | { | 2756 | { |
2759 | struct inode *inode = state->inode; | 2757 | struct inode *inode = state->inode; |
2760 | struct nfs_server *server = NFS_SERVER(inode); | 2758 | struct nfs_server *server = NFS_SERVER(inode); |
2761 | struct nfs4_client *clp = server->nfs4_state; | ||
2762 | struct nfs_lockargs arg = { | 2759 | struct nfs_lockargs arg = { |
2763 | .fh = NFS_FH(inode), | 2760 | .fh = NFS_FH(inode), |
2764 | .type = nfs4_lck_type(cmd, request), | 2761 | .type = nfs4_lck_type(cmd, request), |
@@ -2778,7 +2775,6 @@ static int _nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock | |||
2778 | struct nfs_locku_opargs luargs; | 2775 | struct nfs_locku_opargs luargs; |
2779 | int status; | 2776 | int status; |
2780 | 2777 | ||
2781 | down_read(&clp->cl_sem); | ||
2782 | status = nfs4_set_lock_state(state, request); | 2778 | status = nfs4_set_lock_state(state, request); |
2783 | if (status != 0) | 2779 | if (status != 0) |
2784 | goto out; | 2780 | goto out; |
@@ -2802,7 +2798,6 @@ static int _nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock | |||
2802 | out: | 2798 | out: |
2803 | if (status == 0) | 2799 | if (status == 0) |
2804 | do_vfs_lock(request->fl_file, request); | 2800 | do_vfs_lock(request->fl_file, request); |
2805 | up_read(&clp->cl_sem); | ||
2806 | return status; | 2801 | return status; |
2807 | } | 2802 | } |
2808 | 2803 | ||