smbd: Use remove_oplock() in close_normal_file
authorVolker Lendecke <vl@samba.org>
Fri, 13 Sep 2013 11:49:20 +0000 (13:49 +0200)
committerDavid Disseldorp <ddiss@samba.org>
Thu, 24 Oct 2013 12:21:52 +0000 (14:21 +0200)
remove_oplock is a wrapper around release_file_oplock. This streamlines
the exports of oplock.c a bit.

Reason for this patch: In a later patch I will add functionality to
remove_oplock that is required in close_normal_file as well.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
source3/smbd/close.c

index f341c729521ae68026bd6a2db56f8c1a620cc446..6153066018f3d4c3e53221d60a6762ccd4faa512 100644 (file)
@@ -735,7 +735,7 @@ static NTSTATUS close_normal_file(struct smb_request *req, files_struct *fsp,
 
        /* Remove the oplock before potentially deleting the file. */
        if(fsp->oplock_type) {
-               release_file_oplock(fsp);
+               remove_oplock(fsp);
        }
 
        /* If this is an old DOS or FCB open and we have multiple opens on