From owner-svn-src-all@FreeBSD.ORG Mon Jul 7 23:21:08 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91CE5EAE; Mon, 7 Jul 2014 23:21:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 7EB4E2C5B; Mon, 7 Jul 2014 23:21:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s67NL86M070575; Mon, 7 Jul 2014 23:21:08 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s67NL8HX070573; Mon, 7 Jul 2014 23:21:08 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201407072321.s67NL8HX070573@svn.freebsd.org> From: Warner Losh Date: Mon, 7 Jul 2014 23:21:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268374 - in head/sys: fs/nandfs sys X-SVN-Group: head 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.18 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, 07 Jul 2014 23:21:08 -0000 Author: imp Date: Mon Jul 7 23:21:07 2014 New Revision: 268374 URL: http://svnweb.freebsd.org/changeset/base/268374 Log: Naughty NANDFS was using hidden unused flag, hiding the fact that the flag was used and wasn't really available. Change the name without fixing any laying issues that might be present in NANDFS' use of this flag. Modified: head/sys/fs/nandfs/nandfs.h head/sys/sys/buf.h Modified: head/sys/fs/nandfs/nandfs.h ============================================================================== --- head/sys/fs/nandfs/nandfs.h Mon Jul 7 22:02:39 2014 (r268373) +++ head/sys/fs/nandfs/nandfs.h Mon Jul 7 23:21:07 2014 (r268374) @@ -303,8 +303,8 @@ struct nandfs_node { #define PRINT_NODE_FLAGS \ "\10\1IN_ACCESS\2IN_CHANGE\3IN_UPDATE\4IN_MODIFIED\5IN_RENAME" -#define NANDFS_GATHER(x) ((x)->b_flags |= B_00800000) -#define NANDFS_UNGATHER(x) ((x)->b_flags &= ~B_00800000) -#define NANDFS_ISGATHERED(x) ((x)->b_flags & B_00800000) +#define NANDFS_GATHER(x) ((x)->b_flags |= B_FS_FLAG1) +#define NANDFS_UNGATHER(x) ((x)->b_flags &= ~B_FS_FLAG1) +#define NANDFS_ISGATHERED(x) ((x)->b_flags & B_FS_FLAG1) #endif /* !_FS_NANDFS_NANDFS_H_ */ Modified: head/sys/sys/buf.h ============================================================================== --- head/sys/sys/buf.h Mon Jul 7 22:02:39 2014 (r268373) +++ head/sys/sys/buf.h Mon Jul 7 23:21:07 2014 (r268374) @@ -213,7 +213,7 @@ struct buf { #define B_00100000 0x00100000 /* Available flag. */ #define B_DIRTY 0x00200000 /* Needs writing later (in EXT2FS). */ #define B_RELBUF 0x00400000 /* Release VMIO buffer. */ -#define B_00800000 0x00800000 /* Available flag. */ +#define B_FS_FLAG1 0x00800000 /* Available flag for FS use. */ #define B_NOCOPY 0x01000000 /* Don't copy-on-write this buf. */ #define B_INFREECNT 0x02000000 /* buf is counted in numfreebufs */ #define B_PAGING 0x04000000 /* volatile paging I/O -- bypass VMIO */