VOP_FSYNC() expects to be called with the vnode locked, so lock fvp in

nfs_rename() before calling VOP_FSYNC() and unlock fvp immediately after.

Reviewed by:	bde
This commit is contained in:
truckman 2003-04-24 20:39:40 +00:00
parent 283995afb1
commit 822f19a5dd

View File

@ -1521,6 +1521,14 @@ nfs_rename(struct vop_rename_args *ap)
goto out;
}
if (fvp == tvp) {
printf("nfs_rename: fvp == tvp (can't happen)\n");
error = 0;
goto out;
}
if ((error = vn_lock(fvp, LK_EXCLUSIVE, fcnp->cn_thread)) != 0)
goto out;
/*
* We have to flush B_DELWRI data prior to renaming
* the file. If we don't, the delayed-write buffers
@ -1529,8 +1537,8 @@ nfs_rename(struct vop_rename_args *ap)
* ( as far as I can tell ) it flushes dirty buffers more
* often.
*/
VOP_FSYNC(fvp, fcnp->cn_cred, MNT_WAIT, fcnp->cn_thread);
VOP_UNLOCK(fvp, 0, fcnp->cn_thread);
if (tvp)
VOP_FSYNC(tvp, tcnp->cn_cred, MNT_WAIT, tcnp->cn_thread);