From owner-svn-src-all@freebsd.org Mon Jan 18 16:41:27 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA87BA87471; Mon, 18 Jan 2016 16:41:27 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 990D3147C; Mon, 18 Jan 2016 16:41:27 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0IGfQLU025156; Mon, 18 Jan 2016 16:41:26 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0IGfQrc025155; Mon, 18 Jan 2016 16:41:26 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201601181641.u0IGfQrc025155@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 18 Jan 2016 16:41:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r294278 - stable/10/sbin/mount X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2016 16:41:27 -0000 Author: asomers Date: Mon Jan 18 16:41:26 2016 New Revision: 294278 URL: https://svnweb.freebsd.org/changeset/base/294278 Log: MFC r292573 Fix "mount -a" for NFS and ZFS filesystems with shared mountpoints sbin/mount.c Check whether an fstab entry has the same fstype as a mounted filesystem before declaring it to be mounted. This will allow NFS filesystems that share a mountpoint with a local filesystem to be automatically mounted at boot. This is not such an unusual situation. For example, if somebody uses the standard installer with a ZFS root, he'll get a /usr/home filesystem, even though he may choose to mount /usr/home over NFS. Modified: stable/10/sbin/mount/mount.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/mount/mount.c ============================================================================== --- stable/10/sbin/mount/mount.c Mon Jan 18 16:33:03 2016 (r294277) +++ stable/10/sbin/mount/mount.c Mon Jan 18 16:41:26 2016 (r294278) @@ -485,10 +485,18 @@ ismounted(struct fstab *fs, struct statf strlcpy(realfsfile, fs->fs_file, sizeof(realfsfile)); } + /* + * Consider the filesystem to be mounted if: + * It has the same mountpoint as a mounted filesytem, and + * It has the same type as that same mounted filesystem, and + * It has the same device name as that same mounted filesystem, OR + * It is a nonremountable filesystem + */ for (i = mntsize - 1; i >= 0; --i) if (strcmp(realfsfile, mntbuf[i].f_mntonname) == 0 && + strcmp(fs->fs_vfstype, mntbuf[i].f_fstypename) == 0 && (!isremountable(fs->fs_vfstype) || - strcmp(fs->fs_spec, mntbuf[i].f_mntfromname) == 0)) + (strcmp(fs->fs_spec, mntbuf[i].f_mntfromname) == 0))) return (1); return (0); }