From owner-svn-src-stable-7@FreeBSD.ORG  Sun Dec  4 01:22:22 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EB1D6106566C;
	Sun,  4 Dec 2011 01:22:22 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DA5F18FC0A;
	Sun,  4 Dec 2011 01:22:22 +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 pB41MMK0064440;
	Sun, 4 Dec 2011 01:22:22 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB41MMqh064438;
	Sun, 4 Dec 2011 01:22:22 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201112040122.pB41MMqh064438@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 4 Dec 2011 01:22:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228250 - stable/7/sys/fs/tmpfs
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Dec 2011 01:22:23 -0000

Author: alc
Date: Sun Dec  4 01:22:22 2011
New Revision: 228250
URL: http://svn.freebsd.org/changeset/base/228250

Log:
  MFC r218863
    tmpfs_remove() isn't modifying the file's data, so it shouldn't set
    TMPFS_NODE_MODIFIED on the node.
  
  PR:		152488

Modified:
  stable/7/sys/fs/tmpfs/tmpfs_vnops.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- stable/7/sys/fs/tmpfs/tmpfs_vnops.c	Sun Dec  4 01:15:52 2011	(r228249)
+++ stable/7/sys/fs/tmpfs/tmpfs_vnops.c	Sun Dec  4 01:22:22 2011	(r228250)
@@ -791,8 +791,7 @@ tmpfs_remove(struct vop_remove_args *v)
 	tmpfs_free_dirent(tmp, de, TRUE);
 
 	if (node->tn_links > 0)
-		node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED | \
-	    TMPFS_NODE_MODIFIED;
+		node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED;
 	error = 0;
 
 out: