From owner-freebsd-bugs@FreeBSD.ORG Mon Nov 14 16:10:07 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAC1D106566B for ; Mon, 14 Nov 2011 16:10:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A40008FC18 for ; Mon, 14 Nov 2011 16:10:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id pAEGA7VP063951 for ; Mon, 14 Nov 2011 16:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id pAEGA7ii063950; Mon, 14 Nov 2011 16:10:07 GMT (envelope-from gnats) Resent-Date: Mon, 14 Nov 2011 16:10:07 GMT Resent-Message-Id: <201111141610.pAEGA7ii063950@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, gnehzuil Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5EB451065673 for ; Mon, 14 Nov 2011 16:03:26 +0000 (UTC) (envelope-from gnehzuil@gmail.com) Received: from mail-yx0-f182.google.com (mail-yx0-f182.google.com [209.85.213.182]) by mx1.freebsd.org (Postfix) with ESMTP id 202F58FC0A for ; Mon, 14 Nov 2011 16:03:25 +0000 (UTC) Received: by yenl11 with SMTP id l11so1628882yen.13 for ; Mon, 14 Nov 2011 08:03:25 -0800 (PST) Received: by 10.68.0.129 with SMTP id 1mr50068091pbe.94.1321284872924; Mon, 14 Nov 2011 07:34:32 -0800 (PST) Received: from gnehzuil-freebsd ([222.131.4.232]) by mx.google.com with ESMTPS id lt8sm57385126pbb.0.2011.11.14.07.34.27 (version=SSLv3 cipher=OTHER); Mon, 14 Nov 2011 07:34:32 -0800 (PST) Received: by gnehzuil-freebsd (sSMTP sendmail emulation); Mon, 14 Nov 2011 23:34:21 +0800 Message-Id: <4ec13508.a87a440a.7d22.ffffdca2@mx.google.com> Date: Mon, 14 Nov 2011 23:34:21 +0800 From: gnehzuil To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: giffunip@yahoo.com Subject: kern/162564: [ext2fs][patch] fs/ext2fs: Add include guard X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: gnehzuil List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Nov 2011 16:10:08 -0000 >Number: 162564 >Category: kern >Synopsis: [ext2fs][patch] fs/ext2fs: Add include guard >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 14 16:10:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Zheng Liu >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD freebsd-dev 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Mon Nov 14 11:44:58 CST 2011 root@freebsd-dev:/usr/obj/usr/src/sys/CURRENT amd64 >Description: A include guard is added into fs.h to avoid duplicated include operation. A include guard name is changed according to style in ext2fs.h. >How-To-Repeat: >Fix: --- ext2fs-include-guard.patch begins here --- diff -urN fs/ext2fs.orig/ext2fs.h fs/ext2fs/ext2fs.h --- fs/ext2fs.orig/ext2fs.h 2011-11-14 16:08:35.000000000 +0800 +++ fs/ext2fs/ext2fs.h 2011-11-14 16:07:46.000000000 +0800 @@ -34,8 +34,8 @@ * */ -#ifndef _FS_EXT2FS_EXT2_FS_H_ -#define _FS_EXT2FS_EXT2_FS_H_ +#ifndef _FS_EXT2FS_EXT2FS_H_ +#define _FS_EXT2FS_EXT2FS_H_ #include diff -urN fs/ext2fs.orig/fs.h fs/ext2fs/fs.h --- fs/ext2fs.orig/fs.h 2011-11-14 16:08:35.000000000 +0800 +++ fs/ext2fs/fs.h 2011-11-14 16:07:32.000000000 +0800 @@ -36,6 +36,9 @@ * $FreeBSD: src/sys/fs/ext2fs/fs.h,v 1.1 2010/01/14 14:30:54 lulf Exp $ */ +#ifndef _FS_EXT2FS_FS_H_ +#define _FS_EXT2FS_FS_H_ + /* * Each disk drive contains some number of file systems. * A file system consists of a number of cylinder groups. @@ -149,4 +152,4 @@ extern int inside[], around[]; extern u_char *fragtbl[]; - +#endif /* !_FS_EXT2FS_FS_H_ */ --- ext2fs-include-guard.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: