| nfs_vfsops.c (108161) | nfs_vfsops.c (109623) |
|---|---|
| 1/* 2 * Copyright (c) 1989, 1993, 1995 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 --- 23 unchanged lines hidden (view full) --- 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 * 36 * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 37 */ 38 39#include <sys/cdefs.h> | 1/* 2 * Copyright (c) 1989, 1993, 1995 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 --- 23 unchanged lines hidden (view full) --- 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 * 36 * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 37 */ 38 39#include <sys/cdefs.h> |
| 40__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_vfsops.c 108161 2002-12-21 20:55:34Z dillon $"); | 40__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_vfsops.c 109623 2003-01-21 08:56:16Z alfred $"); |
| 41 42#include "opt_bootp.h" 43#include "opt_nfsroot.h" 44 45#include <sys/param.h> 46#include <sys/systm.h> 47#include <sys/kernel.h> 48#include <sys/lock.h> --- 754 unchanged lines hidden (view full) --- 803 struct vattr attrs; 804 805 if (mp->mnt_flag & MNT_UPDATE) { 806 nmp = VFSTONFS(mp); 807 /* update paths, file handles, etc, here XXX */ 808 FREE(nam, M_SONAME); 809 return (0); 810 } else { | 41 42#include "opt_bootp.h" 43#include "opt_nfsroot.h" 44 45#include <sys/param.h> 46#include <sys/systm.h> 47#include <sys/kernel.h> 48#include <sys/lock.h> --- 754 unchanged lines hidden (view full) --- 803 struct vattr attrs; 804 805 if (mp->mnt_flag & MNT_UPDATE) { 806 nmp = VFSTONFS(mp); 807 /* update paths, file handles, etc, here XXX */ 808 FREE(nam, M_SONAME); 809 return (0); 810 } else { |
| 811 nmp = uma_zalloc(nfsmount_zone, M_WAITOK); | 811 nmp = uma_zalloc(nfsmount_zone, 0); |
| 812 bzero((caddr_t)nmp, sizeof (struct nfsmount)); 813 TAILQ_INIT(&nmp->nm_bufq); 814 mp->mnt_data = (qaddr_t)nmp; 815 } 816 vfs_getnewfsid(mp); 817 nmp->nm_mountp = mp; 818 819 /* --- 188 unchanged lines hidden --- | 812 bzero((caddr_t)nmp, sizeof (struct nfsmount)); 813 TAILQ_INIT(&nmp->nm_bufq); 814 mp->mnt_data = (qaddr_t)nmp; 815 } 816 vfs_getnewfsid(mp); 817 nmp->nm_mountp = mp; 818 819 /* --- 188 unchanged lines hidden --- |