| vfs_mount.c (122640) | vfs_mount.c (122965) |
|---|---|
| 1/* 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 49 unchanged lines hidden (view full) --- 58 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 62 * SUCH DAMAGE. 63 */ 64 65#include <sys/cdefs.h> | 1/* 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 49 unchanged lines hidden (view full) --- 58 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 62 * SUCH DAMAGE. 63 */ 64 65#include <sys/cdefs.h> |
| 66__FBSDID("$FreeBSD: head/sys/kern/vfs_mount.c 122640 2003-11-14 05:27:41Z kan $"); | 66__FBSDID("$FreeBSD: head/sys/kern/vfs_mount.c 122965 2003-11-23 17:13:48Z kan $"); |
| 67 68#include <sys/param.h> 69#include <sys/conf.h> 70#include <sys/cons.h> 71#include <sys/kernel.h> 72#include <sys/linker.h> 73#include <sys/mac.h> 74#include <sys/malloc.h> --- 453 unchanged lines hidden (view full) --- 528 vfs_unbusy(mp,td); 529 lockdestroy(&mp->mnt_lock); 530 mtx_destroy(&mp->mnt_mtx); 531 if (mp->mnt_kern_flag & MNTK_MWAIT) 532 wakeup(mp); 533#ifdef MAC 534 mac_destroy_mount(mp); 535#endif | 67 68#include <sys/param.h> 69#include <sys/conf.h> 70#include <sys/cons.h> 71#include <sys/kernel.h> 72#include <sys/linker.h> 73#include <sys/mac.h> 74#include <sys/malloc.h> --- 453 unchanged lines hidden (view full) --- 528 vfs_unbusy(mp,td); 529 lockdestroy(&mp->mnt_lock); 530 mtx_destroy(&mp->mnt_mtx); 531 if (mp->mnt_kern_flag & MNTK_MWAIT) 532 wakeup(mp); 533#ifdef MAC 534 mac_destroy_mount(mp); 535#endif |
| 536 if (mp->mnt_op->vfs_mount == NULL) | 536 if (mp->mnt_opt != NULL) |
| 537 vfs_freeopts(mp->mnt_opt); 538 crfree(mp->mnt_cred); 539 free(mp, M_MOUNT); 540} 541 542static int 543vfs_nmount(struct thread *td, int fsflags, struct uio *fsoptions) 544{ --- 996 unchanged lines hidden --- | 537 vfs_freeopts(mp->mnt_opt); 538 crfree(mp->mnt_cred); 539 free(mp, M_MOUNT); 540} 541 542static int 543vfs_nmount(struct thread *td, int fsflags, struct uio *fsoptions) 544{ --- 996 unchanged lines hidden --- |