| vfs_mount.c (131562) | vfs_mount.c (131691) |
|---|---|
| 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. --- 45 unchanged lines hidden (view full) --- 54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 58 * SUCH DAMAGE. 59 */ 60 61#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. --- 45 unchanged lines hidden (view full) --- 54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 58 * SUCH DAMAGE. 59 */ 60 61#include <sys/cdefs.h> |
| 62__FBSDID("$FreeBSD: head/sys/kern/vfs_mount.c 131562 2004-07-04 10:52:54Z alfred $"); | 62__FBSDID("$FreeBSD: head/sys/kern/vfs_mount.c 131691 2004-07-06 09:12:03Z alfred $"); |
| 63 64#include <sys/param.h> 65#include <sys/conf.h> 66#include <sys/cons.h> 67#include <sys/jail.h> 68#include <sys/kernel.h> 69#include <sys/linker.h> 70#include <sys/mac.h> --- 852 unchanged lines hidden (view full) --- 923 924 VI_LOCK(vp); 925 vp->v_iflag &= ~VI_MOUNT; 926 VI_UNLOCK(vp); 927 vp->v_mountedhere = mp; 928 mtx_lock(&mountlist_mtx); 929 TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list); 930 mtx_unlock(&mountlist_mtx); | 63 64#include <sys/param.h> 65#include <sys/conf.h> 66#include <sys/cons.h> 67#include <sys/jail.h> 68#include <sys/kernel.h> 69#include <sys/linker.h> 70#include <sys/mac.h> --- 852 unchanged lines hidden (view full) --- 923 924 VI_LOCK(vp); 925 vp->v_iflag &= ~VI_MOUNT; 926 VI_UNLOCK(vp); 927 vp->v_mountedhere = mp; 928 mtx_lock(&mountlist_mtx); 929 TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list); 930 mtx_unlock(&mountlist_mtx); |
| 931 vfs_event_signal(NULL, VQ_MOUNT, NULL); | 931 vfs_event_signal(NULL, VQ_MOUNT, 0); |
| 932 if (VFS_ROOT(mp, &newdp)) 933 panic("mount: lost mount"); 934 checkdirs(vp, newdp); 935 vput(newdp); 936 VOP_UNLOCK(vp, 0, td); 937 if ((mp->mnt_flag & MNT_RDONLY) == 0) 938 error = vfs_allocate_syncvnode(mp); 939 vfs_unbusy(mp, td); --- 229 unchanged lines hidden (view full) --- 1169 wakeup(mp); 1170 return (error); 1171 } 1172 mtx_lock(&mountlist_mtx); 1173 TAILQ_REMOVE(&mountlist, mp, mnt_list); 1174 if ((coveredvp = mp->mnt_vnodecovered) != NULL) 1175 coveredvp->v_mountedhere = NULL; 1176 mtx_unlock(&mountlist_mtx); | 932 if (VFS_ROOT(mp, &newdp)) 933 panic("mount: lost mount"); 934 checkdirs(vp, newdp); 935 vput(newdp); 936 VOP_UNLOCK(vp, 0, td); 937 if ((mp->mnt_flag & MNT_RDONLY) == 0) 938 error = vfs_allocate_syncvnode(mp); 939 vfs_unbusy(mp, td); --- 229 unchanged lines hidden (view full) --- 1169 wakeup(mp); 1170 return (error); 1171 } 1172 mtx_lock(&mountlist_mtx); 1173 TAILQ_REMOVE(&mountlist, mp, mnt_list); 1174 if ((coveredvp = mp->mnt_vnodecovered) != NULL) 1175 coveredvp->v_mountedhere = NULL; 1176 mtx_unlock(&mountlist_mtx); |
| 1177 vfs_event_signal(NULL, VQ_UNMOUNT, NULL); | 1177 vfs_event_signal(NULL, VQ_UNMOUNT, 0); |
| 1178 vfs_mount_destroy(mp, td); 1179 if (coveredvp != NULL) 1180 vrele(coveredvp); 1181 return (0); 1182} 1183 1184/* 1185 * Lookup a filesystem type, and if found allocate and initialize --- 447 unchanged lines hidden --- | 1178 vfs_mount_destroy(mp, td); 1179 if (coveredvp != NULL) 1180 vrele(coveredvp); 1181 return (0); 1182} 1183 1184/* 1185 * Lookup a filesystem type, and if found allocate and initialize --- 447 unchanged lines hidden --- |