From: "John L. Hammond" <john.hamm...@intel.com> Remove the superfluous header lustre/include/linux/lustre_quota.h.
Signed-off-by: John L. Hammond <john.hamm...@intel.com> --- .../lustre/lustre/include/linux/lustre_quota.h | 46 -------------------- .../staging/lustre/lustre/include/lustre_quota.h | 4 +- 2 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_quota.h diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_quota.h b/drivers/staging/lustre/lustre/include/linux/lustre_quota.h deleted file mode 100644 index a395050..0000000 --- a/drivers/staging/lustre/lustre/include/linux/lustre_quota.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef _LINUX_LUSTRE_QUOTA_H -#define _LINUX_LUSTRE_QUOTA_H - -#ifndef _LUSTRE_QUOTA_H -#error Do not #include this file directly. #include <lustre_quota.h> instead -#endif - -#include <linux/fs.h> -#include <linux/quota.h> -#include <linux/quotaops.h> - -#endif /* _LUSTRE_QUOTA_H */ diff --git a/drivers/staging/lustre/lustre/include/lustre_quota.h b/drivers/staging/lustre/lustre/include/lustre_quota.h index 1ae72e3..2643f28 100644 --- a/drivers/staging/lustre/lustre/include/lustre_quota.h +++ b/drivers/staging/lustre/lustre/include/lustre_quota.h @@ -32,7 +32,9 @@ * */ -#include "linux/lustre_quota.h" +#include <linux/fs.h> +#include <linux/quota.h> +#include <linux/quotaops.h> #include "dt_object.h" #include "lustre_fid.h" -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
