diff options
Diffstat (limited to 'usr/src/uts/common/fs/nbmlock.c')
| -rw-r--r-- | usr/src/uts/common/fs/nbmlock.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/uts/common/fs/nbmlock.c b/usr/src/uts/common/fs/nbmlock.c index bb9dd88722..add00c6b1f 100644 --- a/usr/src/uts/common/fs/nbmlock.c +++ b/usr/src/uts/common/fs/nbmlock.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,8 +19,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -133,13 +132,14 @@ nbl_conflict(vnode_t *vp, nbl_op_t op, /* attempted operation */ u_offset_t offset, /* ignore if not I/O */ ssize_t length, /* ignore if not I/O */ - int svmand) /* System V mandatory locking */ + int svmand, /* System V mandatory locking */ + caller_context_t *ct) /* caller context */ { ASSERT(nbl_in_crit(vp)); ASSERT(op == NBL_READ || op == NBL_WRITE || op == NBL_RENAME || op == NBL_REMOVE || op == NBL_READWRITE); - if (nbl_share_conflict(vp, op)) { + if (nbl_share_conflict(vp, op, ct)) { return (1); } @@ -150,7 +150,7 @@ nbl_conflict(vnode_t *vp, if (op == NBL_REMOVE || op == NBL_RENAME) return (0); - return (nbl_lock_conflict(vp, op, offset, length, svmand)); + return (nbl_lock_conflict(vp, op, offset, length, svmand, ct)); } /* @@ -167,7 +167,7 @@ nbl_svmand(vnode_t *vp, cred_t *cr, int *svp) int error; va.va_mask = AT_MODE; - error = VOP_GETATTR(vp, &va, 0, cr); + error = VOP_GETATTR(vp, &va, 0, cr, NULL); if (error != 0) return (error); |