Page MenuHomeFreeBSD
Files F153507931

D17853.diff
No OneTemporary
Actions

D17853.diff
View Options

Index: head/sys/fs/nfsclient/nfs_clvnops.c
===================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c
+++ head/sys/fs/nfsclient/nfs_clvnops.c
@@ -3030,16 +3030,16 @@
struct proc *p = (struct proc *)ap->a_id;
struct thread *td = curthread; /* XXX */
struct vattr va;
- int ret, error = EOPNOTSUPP;
+ int ret, error;
u_quad_t size;
- ret = NFSVOPLOCK(vp, LK_SHARED);
- if (ret != 0)
+ error = NFSVOPLOCK(vp, LK_SHARED);
+ if (error != 0)
return (EBADF);
if (NFS_ISV4(vp) && (ap->a_flags & (F_POSIX | F_FLOCK)) != 0) {
if (vp->v_type != VREG) {
- NFSVOPUNLOCK(vp, 0);
- return (EINVAL);
+ error = EINVAL;
+ goto out;
}
if ((ap->a_flags & F_POSIX) != 0)
cred = p->p_ucred;
@@ -3047,8 +3047,8 @@
cred = td->td_ucred;
NFSVOPLOCK(vp, LK_UPGRADE | LK_RETRY);
if (vp->v_iflag & VI_DOOMED) {
- NFSVOPUNLOCK(vp, 0);
- return (EBADF);
+ error = EBADF;
+ goto out;
}
/*
@@ -3077,21 +3077,21 @@
return (EINTR);
NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY);
if (vp->v_iflag & VI_DOOMED) {
- NFSVOPUNLOCK(vp, 0);
- return (EBADF);
+ error = EBADF;
+ goto out;
}
}
} while (ret == NFSERR_DENIED && (ap->a_flags & F_WAIT) &&
ap->a_op == F_SETLK);
if (ret == NFSERR_DENIED) {
- NFSVOPUNLOCK(vp, 0);
- return (EAGAIN);
+ error = EAGAIN;
+ goto out;
} else if (ret == EINVAL || ret == EBADF || ret == EINTR) {
- NFSVOPUNLOCK(vp, 0);
- return (ret);
+ error = ret;
+ goto out;
} else if (ret != 0) {
- NFSVOPUNLOCK(vp, 0);
- return (EACCES);
+ error = EACCES;
+ goto out;
}
/*
@@ -3121,8 +3121,6 @@
np->n_flag |= NHASBEENLOCKED;
mtx_unlock(&np->n_mtx);
}
- NFSVOPUNLOCK(vp, 0);
- return (0);
} else if (!NFS_ISV4(vp)) {
if ((VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOLOCKD) != 0) {
size = VTONFS(vp)->n_size;
@@ -3146,8 +3144,11 @@
NFSVOPUNLOCK(vp, 0);
}
}
+ return (error);
} else
- NFSVOPUNLOCK(vp, 0);
+ error = EOPNOTSUPP;
+out:
+ NFSVOPUNLOCK(vp, 0);
return (error);
}

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 12:51 PM (9 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31980195
Default Alt Text
D17853.diff (2 KB)

Event Timeline