From owner-svn-src-head@FreeBSD.ORG  Thu Apr 29 10:04:00 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E519E1065672;
	Thu, 29 Apr 2010 10:04:00 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D4DB48FC14;
	Thu, 29 Apr 2010 10:04:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3TA40iw020279;
	Thu, 29 Apr 2010 10:04:00 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3TA404C020277;
	Thu, 29 Apr 2010 10:04:00 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201004291004.o3TA404C020277@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Thu, 29 Apr 2010 10:04:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207366 - head/sys/ufs/ffs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Apr 2010 10:04:01 -0000

Author: avg
Date: Thu Apr 29 10:04:00 2010
New Revision: 207366
URL: http://svn.freebsd.org/changeset/base/207366

Log:
  ffs_vfsops: restore alphabetic order of options in ffs_opts
  
  The order was not correct only for nfsv4acls.
  ("no" prefix is ignored)
  
  MFC after:	1 week

Modified:
  head/sys/ufs/ffs/ffs_vfsops.c

Modified: head/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- head/sys/ufs/ffs/ffs_vfsops.c	Thu Apr 29 09:59:16 2010	(r207365)
+++ head/sys/ufs/ffs/ffs_vfsops.c	Thu Apr 29 10:04:00 2010	(r207366)
@@ -126,8 +126,8 @@ static struct buf_ops ffs_ops = {
 
 static const char *ffs_opts[] = { "acls", "async", "noatime", "noclusterr",
     "noclusterw", "noexec", "export", "force", "from", "multilabel", 
-    "snapshot", "nosuid", "suiddir", "nosymfollow", "sync",
-    "union", "nfsv4acls", NULL };
+    "nfsv4acls", "snapshot", "nosuid", "suiddir", "nosymfollow", "sync",
+    "union", NULL };
 
 static int
 ffs_mount(struct mount *mp)