Commit 616331c3 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging/lustre: remove linux/obd_class.h 



Kill the macro ll_inode_flags() and remove the superfluous header
lustre/include/linux/obd_class.h.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39c93341

drivers/staging/lustre/lustre/include/linux/obd_class.h

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
/*

 * 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) 2011, 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, struct lu_attr *la, __u64 valid);

void la_from_obdo(struct lu_attr *la, struct obdo *dst, u32 valid);

void obdo_refresh_inode(struct inode *dst, struct obdo *src, u32 valid);

void obdo_to_inode(struct inode *dst, struct obdo *src, u32 valid);

#define ll_inode_flags(inode)	 (inode->i_flags)





#endif /* __LINUX_OBD_CLASS_H */

drivers/staging/lustre/lustre/include/obd_class.h

+7 −2
Original line number Diff line number Diff line
@@ -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
@@ -307,6 +305,13 @@ static inline enum obd_option exp_flags_from_obd(struct obd_device *obd) 
		0);

}



struct inode;

struct lu_attr;

struct obdo;

void obdo_from_la(struct obdo *dst, struct lu_attr *la, __u64 valid);

void la_from_obdo(struct lu_attr *la, struct obdo *dst, u32 valid);

void obdo_refresh_inode(struct inode *dst, struct obdo *src, u32 valid);

void obdo_to_inode(struct inode *dst, struct obdo *src, u32 valid);



void obdo_cpy_md(struct obdo *dst, struct obdo *src, u32 valid);

void obdo_to_ioobj(struct obdo *oa, struct obd_ioobj *ioobj);

drivers/staging/lustre/lustre/obdclass/obdo.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, u32 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;