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

staging: lustre: remove lustre_lite.h 



Move several definition only used in lustre/llite/ to
lustre/llite/llite_internal.h.
Remove lustre/include/{,linux/}lustre_lite.h and fixup
the missing includes in other headers that this exposes.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/11501


Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 346dc1c8

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

deleted100644 → 0
+0 −91
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.gnu.org/licenses/gpl-2.0.html

 *

 * GPL HEADER END

 */

/*

 * Copyright (c) 2002, 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_LL_H

#define _LINUX_LL_H



#ifndef _LL_H

#error Do not #include this file directly. #include <lustre_lite.h> instead

#endif



#include <linux/statfs.h>



#include <linux/fs.h>

#include <linux/dcache.h>



#include "../obd_class.h"

#include "../lustre_net.h"

#include "../lustre_ha.h"



#include <linux/rbtree.h>

#include "../../include/linux/lustre_compat25.h"

#include <linux/pagemap.h>



/* lprocfs.c */

enum {

	 LPROC_LL_DIRTY_HITS = 0,

	 LPROC_LL_DIRTY_MISSES,

	 LPROC_LL_READ_BYTES,

	 LPROC_LL_WRITE_BYTES,

	 LPROC_LL_BRW_READ,

	 LPROC_LL_BRW_WRITE,

	 LPROC_LL_OSC_READ,

	 LPROC_LL_OSC_WRITE,

	 LPROC_LL_IOCTL,

	 LPROC_LL_OPEN,

	 LPROC_LL_RELEASE,

	 LPROC_LL_MAP,

	 LPROC_LL_LLSEEK,

	 LPROC_LL_FSYNC,

	 LPROC_LL_READDIR,

	 LPROC_LL_SETATTR,

	 LPROC_LL_TRUNC,

	 LPROC_LL_FLOCK,

	 LPROC_LL_GETATTR,

	 LPROC_LL_CREATE,

	 LPROC_LL_LINK,

	 LPROC_LL_UNLINK,

	 LPROC_LL_SYMLINK,

	 LPROC_LL_MKDIR,

	 LPROC_LL_RMDIR,

	 LPROC_LL_MKNOD,

	 LPROC_LL_RENAME,

	 LPROC_LL_STAFS,

	 LPROC_LL_ALLOC_INODE,

	 LPROC_LL_SETXATTR,

	 LPROC_LL_GETXATTR,

	 LPROC_LL_GETXATTR_HITS,

	 LPROC_LL_LISTXATTR,

	 LPROC_LL_REMOVEXATTR,

	 LPROC_LL_INODE_PERM,

	 LPROC_LL_FILE_OPCODES

};



#endif

drivers/staging/lustre/lustre/include/lustre_eacl.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


#ifdef CONFIG_FS_POSIX_ACL



#include <linux/fs.h>

#include <linux/posix_acl_xattr.h>



typedef struct {

drivers/staging/lustre/lustre/include/lustre_lite.h

deleted100644 → 0
+0 −85
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.gnu.org/licenses/gpl-2.0.html

 *

 * GPL HEADER END

 */

/*

 * Copyright (c) 2007, 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 _LL_H

#define _LL_H



/** \defgroup lite lite

 *

 * @{

 */



#include "linux/lustre_lite.h"



#include "obd_class.h"

#include "lustre_net.h"

#include "lustre_ha.h"



/* 4UL * 1024 * 1024 */

#define LL_MAX_BLKSIZE_BITS     (22)

#define LL_MAX_BLKSIZE	  (1UL << LL_MAX_BLKSIZE_BITS)



/*

 * This is embedded into llite super-blocks to keep track of

 * connect flags (capabilities) supported by all imports given mount is

 * connected to.

 */

struct lustre_client_ocd {

	/*

	 * This is conjunction of connect_flags across all imports (LOVs) this

	 * mount is connected to. This field is updated by cl_ocd_update()

	 * under ->lco_lock.

	 */

	__u64	      lco_flags;

	struct mutex	   lco_lock;

	struct obd_export *lco_md_exp;

	struct obd_export *lco_dt_exp;

};



/*

 * Chain of hash overflow pages.

 */

struct ll_dir_chain {

	/* XXX something. Later */

};



static inline void ll_dir_chain_init(struct ll_dir_chain *chain)

{

}



static inline void ll_dir_chain_fini(struct ll_dir_chain *chain)

{

}



/** @} lite */



#endif

drivers/staging/lustre/lustre/include/lustre_param.h

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
#ifndef _LUSTRE_PARAM_H

#define _LUSTRE_PARAM_H



#include "../../include/linux/libcfs/libcfs.h"

#include "../../include/linux/lnet/types.h"



/** \defgroup param param

 *

 * @{

drivers/staging/lustre/lustre/llite/dcache.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#define DEBUG_SUBSYSTEM S_LLITE



#include "../include/obd_support.h"

#include "../include/lustre_lite.h"

#include "../include/lustre/lustre_idl.h"

#include "../include/lustre_dlm.h"