| nfs_clsubs.c (223280) | nfs_clsubs.c (224081) |
|---|---|
| 1/*- 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 19 unchanged lines hidden (view full) --- 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * 32 * from nfs_subs.c 8.8 (Berkeley) 5/22/95 33 */ 34 35#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 19 unchanged lines hidden (view full) --- 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * 32 * from nfs_subs.c 8.8 (Berkeley) 5/22/95 33 */ 34 35#include <sys/cdefs.h> |
| 36__FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clsubs.c 223280 2011-06-18 23:02:53Z rmacklem $"); | 36__FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clsubs.c 224081 2011-07-16 08:05:31Z zack $"); |
| 37 38#include "opt_kdtrace.h" 39 40/* 41 * These functions support the macros and help fiddle mbuf chains for 42 * the nfs op functions. They do things like create the rpc header and 43 * copy data between mbuf chains and uio lists. 44 */ --- 98 unchanged lines hidden (view full) --- 143 int old_lock; 144 145 ASSERT_VOP_LOCKED(vp, "ncl_upgrade_vnlock"); 146 old_lock = VOP_ISLOCKED(vp); 147 if (old_lock != LK_EXCLUSIVE) { 148 KASSERT(old_lock == LK_SHARED, 149 ("ncl_upgrade_vnlock: wrong old_lock %d", old_lock)); 150 /* Upgrade to exclusive lock, this might block */ | 37 38#include "opt_kdtrace.h" 39 40/* 41 * These functions support the macros and help fiddle mbuf chains for 42 * the nfs op functions. They do things like create the rpc header and 43 * copy data between mbuf chains and uio lists. 44 */ --- 98 unchanged lines hidden (view full) --- 143 int old_lock; 144 145 ASSERT_VOP_LOCKED(vp, "ncl_upgrade_vnlock"); 146 old_lock = VOP_ISLOCKED(vp); 147 if (old_lock != LK_EXCLUSIVE) { 148 KASSERT(old_lock == LK_SHARED, 149 ("ncl_upgrade_vnlock: wrong old_lock %d", old_lock)); 150 /* Upgrade to exclusive lock, this might block */ |
| 151 vn_lock(vp, LK_UPGRADE | LK_RETRY); | 151 NFSVOPLOCK(vp, LK_UPGRADE | LK_RETRY); |
| 152 } 153 return (old_lock); 154} 155 156void 157ncl_downgrade_vnlock(struct vnode *vp, int old_lock) 158{ 159 if (old_lock != LK_EXCLUSIVE) { 160 KASSERT(old_lock == LK_SHARED, ("wrong old_lock %d", old_lock)); 161 /* Downgrade from exclusive lock. */ | 152 } 153 return (old_lock); 154} 155 156void 157ncl_downgrade_vnlock(struct vnode *vp, int old_lock) 158{ 159 if (old_lock != LK_EXCLUSIVE) { 160 KASSERT(old_lock == LK_SHARED, ("wrong old_lock %d", old_lock)); 161 /* Downgrade from exclusive lock. */ |
| 162 vn_lock(vp, LK_DOWNGRADE | LK_RETRY); | 162 NFSVOPLOCK(vp, LK_DOWNGRADE | LK_RETRY); |
| 163 } 164} 165 166void 167ncl_printf(const char *fmt, ...) 168{ 169 va_list ap; 170 --- 243 unchanged lines hidden --- | 163 } 164} 165 166void 167ncl_printf(const char *fmt, ...) 168{ 169 va_list ap; 170 --- 243 unchanged lines hidden --- |