From owner-svn-src-head@FreeBSD.ORG  Wed Apr 18 15:22:09 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 04D32106566B;
	Wed, 18 Apr 2012 15:22:09 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E4BD58FC0A;
	Wed, 18 Apr 2012 15:22:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3IFM8Ph037393;
	Wed, 18 Apr 2012 15:22:08 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3IFM81K037391;
	Wed, 18 Apr 2012 15:22:08 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201204181522.q3IFM81K037391@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Wed, 18 Apr 2012 15:22:08 +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: r234422 - head/sys/fs/tmpfs
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: Wed, 18 Apr 2012 15:22:09 -0000

Author: jh
Date: Wed Apr 18 15:22:08 2012
New Revision: 234422
URL: http://svn.freebsd.org/changeset/base/234422

Log:
  Return EOPNOTSUPP rather than EPERM for the SF_SNAPSHOT flag because
  tmpfs doesn't support snapshots.
  
  Suggested by:	bde

Modified:
  head/sys/fs/tmpfs/tmpfs_subr.c

Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_subr.c	Wed Apr 18 15:19:00 2012	(r234421)
+++ head/sys/fs/tmpfs/tmpfs_subr.c	Wed Apr 18 15:22:08 2012	(r234422)
@@ -1080,7 +1080,7 @@ tmpfs_chflags(struct vnode *vp, int flag
 
 	if ((flags & ~(UF_NODUMP | UF_IMMUTABLE | UF_APPEND | UF_OPAQUE |
 	    UF_NOUNLINK | SF_ARCHIVED | SF_IMMUTABLE | SF_APPEND |
-	    SF_NOUNLINK | SF_SNAPSHOT)) != 0)
+	    SF_NOUNLINK)) != 0)
 		return (EOPNOTSUPP);
 
 	/* Disallow this operation if the file system is mounted read-only. */
@@ -1104,9 +1104,6 @@ tmpfs_chflags(struct vnode *vp, int flag
 			if (error)
 				return (error);
 		}
-		/* The snapshot flag cannot be toggled. */
-		if ((flags ^ node->tn_flags) & SF_SNAPSHOT)
-			return (EPERM);
 	} else {
 		if (node->tn_flags &
 		    (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND) ||