LU-2675 lustre: remove linux/lustre_quota.h

Remove the (mostly) empty header lustre/include/linux/lustre_quota.h.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: If550ac07e442c640c11f7d23b38f2ec6c166f194
Reviewed-on: http://review.whamcloud.com/11504
Reviewed-by: frank zago <fzago@cray.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>

diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am
index fb240e5..be3bd7f 100644 (file)
--- a/lustre/include/linux/Makefile.am
+++ b/lustre/include/linux/Makefile.am
@@ -44,5 +44,5 @@ endif
 
 EXTRA_DIST = \
        obd_class.h obd_support.h \
 
 EXTRA_DIST = \
        obd_class.h obd_support.h \

-       obd.h lvfs.h lustre_compat25.h lustre_quota.h \
+       obd.h lvfs.h lustre_compat25.h \

        lustre_user.h lustre_patchless_compat.h
        lustre_user.h lustre_patchless_compat.h

diff --git a/lustre/include/linux/lustre_quota.h b/lustre/include/linux/lustre_quota.h
deleted file mode 100644 (file)
index 421866b..0000000
--- a/lustre/include/linux/lustre_quota.h
+++ /dev/null
@@ -1,47 +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/version.h>
-#include <linux/fs.h>
-#include <linux/quota.h>
-#include <linux/quotaops.h>
-
-#endif /* _LUSTRE_QUOTA_H */

diff --git a/lustre/include/lustre_quota.h b/lustre/include/lustre_quota.h
index b7ecbdb..aca4609 100644 (file)
--- a/lustre/include/lustre_quota.h
+++ b/lustre/include/lustre_quota.h
@@ -32,8 +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>
 #include <lustre_dlm.h>
 #include <dt_object.h>
 #include <lustre_fid.h>
 #include <lustre_dlm.h>