summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/fs/nwfs/nwfs_io.c6
-rw-r--r--sys/fs/smbfs/smbfs_io.c6
-rw-r--r--sys/nfsclient/nfs_bio.c11
3 files changed, 8 insertions, 15 deletions
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index 5f8ab333..a64b844 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -607,12 +607,8 @@ nwfs_vinvalbuf(vp, flags, cred, td, intrflg)
/* struct nwmount *nmp = VTONWFS(vp);*/
int error = 0, slpflag, slptimeo;
- if (vp->v_iflag & VI_XLOCK) {
-#ifdef INVARIANTS
- backtrace();
-#endif
+ if (vp->v_iflag & VI_XLOCK)
return (0);
- }
if (intrflg) {
slpflag = PCATCH;
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index e408bea..eed3789 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -679,12 +679,8 @@ smbfs_vinvalbuf(vp, flags, cred, td, intrflg)
struct smbnode *np = VTOSMB(vp);
int error = 0, slpflag, slptimeo;
- if (vp->v_iflag & VI_XLOCK) {
-#ifdef INVARIANTS
- backtrace();
-#endif
+ if (vp->v_iflag & VI_XLOCK)
return 0;
- }
if (intrflg) {
slpflag = PCATCH;
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 9e613ad..a0d507e 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -1067,12 +1067,13 @@ nfs_vinvalbuf(struct vnode *vp, int flags, struct ucred *cred,
ASSERT_VOP_LOCKED(vp, "nfs_vinvalbuf");
- if (vp->v_iflag & VI_XLOCK) {
-#ifdef INVARIANTS
- backtrace();
-#endif
+ /*
+ * XXX This check stops us from needlessly doing a vinvalbuf when
+ * being called through vclean(). It is not clear that this is
+ * unsafe.
+ */
+ if (vp->v_iflag & VI_XLOCK)
return (0);
- }
if ((nmp->nm_flag & NFSMNT_INT) == 0)
intrflg = 0;
OpenPOWER on IntegriCloud