LU-2459 osd: add LMA incompat flag check

[fs/lustre-release.git] / lustre / include / linux / lustre_user.h

diff --git a/lustre/include/linux/lustre_user.h b/lustre/include/linux/lustre_user.h
index b44679e..83b5666 100644 (file)
--- a/lustre/include/linux/lustre_user.h
+++ b/lustre/include/linux/lustre_user.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,14 +43,10 @@
 
 #ifndef __KERNEL__
 # define NEED_QUOTA_DEFS
-# ifdef HAVE_QUOTA_SUPPORT
-#  include <sys/quota.h>
-# endif
+# include <sys/quota.h>
 #else
 # include <linux/version.h>
-# ifdef HAVE_QUOTA_SUPPORT
-#  include <linux/quota.h>
-# endif
+# include <linux/quota.h>
 #endif
 
 /*