LU-2675 lustre: remove linux/obd_class.h

Move some obdo handling declarations from
lustre/include/linux/obd_class.h to lustre/include/obd_class.h. Remove
lustre/include/linux/obd_class.h.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I1e04c97ec7f4bb97b23f57298f52f5efd2c576a2
Reviewed-on: http://review.whamcloud.com/11505
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: frank zago <fzago@cray.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 be3bd7f..bd3b37c 100644 (file)
--- a/lustre/include/linux/Makefile.am
+++ b/lustre/include/linux/Makefile.am
@@ -43,6 +43,6 @@ linux_HEADERS = lustre_user.h
 endif
 
 EXTRA_DIST = \
-       obd_class.h obd_support.h \
+       obd_support.h \
        obd.h lvfs.h lustre_compat25.h \
        lustre_user.h lustre_patchless_compat.h

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
deleted file mode 100644 (file)
index 2c7588c..0000000
--- a/lustre/include/linux/obd_class.h
+++ /dev/null
@@ -1,57 +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) 1999, 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/
- * Lustre is a trademark of Sun Microsystems, Inc.
- */
-
-#ifndef __LINUX_CLASS_OBD_H
-#define __LINUX_CLASS_OBD_H
-
-#ifndef __CLASS_OBD_H
-#error Do not #include this file directly. #include <obd_class.h> instead
-#endif
-
-#include <asm/uaccess.h>
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/time.h>
-#include <linux/timer.h>
-
-/* obdo.c */
-void obdo_from_la(struct obdo *dst, const struct lu_attr *la, __u64 valid);
-void la_from_obdo(struct lu_attr *la, const struct obdo *dst, obd_flag valid);
-void obdo_refresh_inode(struct inode *dst, const struct obdo *src,
-                       obd_flag valid);
-#define ll_inode_flags(inode)         (inode->i_flags)
-
-#endif /* __LINUX_OBD_CLASS_H */

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 60cfae5..0d3a943 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -45,8 +45,6 @@
 #include <lustre/lustre_idl.h>
 #include <lprocfs_status.h>
 
-#include <linux/obd_class.h>
-
 #define OBD_STATFS_NODELAY      0x0001  /* requests should be send without delay
                                          * and resends for avoid deadlocks */
 #define OBD_STATFS_FROM_CACHE   0x0002  /* the statfs callback should not update
@@ -317,6 +315,15 @@ static inline struct lr_server_data *class_server_data(struct obd_device *obd)
 }
 #endif
 
+/* obdo.c */
+struct lu_attr;
+struct inode;
+
+void obdo_from_la(struct obdo *dst, const struct lu_attr *la, __u64 valid);
+void la_from_obdo(struct lu_attr *la, const struct obdo *dst, obd_flag valid);
+void obdo_refresh_inode(struct inode *dst, const struct obdo *src,
+                       obd_flag valid);
+
 void obdo_cpy_md(struct obdo *dst, const struct obdo *src, obd_flag valid);
 void obdo_to_ioobj(const struct obdo *oa, struct obd_ioobj *ioobj);
 void md_from_obdo(struct md_op_data *op_data, const struct obdo *oa,

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index 767cf74..7765fe5 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -108,7 +108,7 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid)
                newvalid |= OBD_MD_FLGID;
        }
        if (valid & OBD_MD_FLFLAGS) {
-               dst->o_flags = ll_inode_flags(src);
+               dst->o_flags = src->i_flags;
                newvalid |= OBD_MD_FLFLAGS;
        }
        dst->o_valid |= newvalid;