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

staging: lustre: remove lustre/include/linux/ 



Merge the contents of lustre/include/linux/lvfs.h into
lustre/include/lvfs.h. Merge lustre/include/linux/lustre_user.h into
lustre/include/lustre/lustre_user.h. Move lustre_compat25.h and
lustre_patchless_compat.h from lustre/include/linux/ to
lustre/include/ and rename lustre_compat25.h to lustre_compat.h.

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/13271


Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarAmir Shehata <amir.shehata@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c658b696

drivers/staging/lustre/lustre/include/cl_object.h

+1 −1
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ 
 * super-class definitions.

 */

#include "lu_object.h"

#include "lustre_compat.h"

#include <linux/atomic.h>

#include "linux/lustre_compat25.h"

#include <linux/mutex.h>

#include <linux/radix-tree.h>

#include <linux/spinlock.h>

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

deleted100644 → 0
+0 −66
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) 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/

 * Lustre is a trademark of Sun Microsystems, Inc.

 *

 * lustre/include/linux/lustre_user.h

 *

 * Lustre public user-space interface definitions.

 */



#ifndef _LINUX_LUSTRE_USER_H

#define _LINUX_LUSTRE_USER_H



# include <linux/quota.h>



/*

 * asm-x86_64/processor.h on some SLES 9 distros seems to use

 * kernel-only typedefs.  fortunately skipping it altogether is ok

 * (for now).

 */

#define __ASM_X86_64_PROCESSOR_H



#include <linux/string.h>



/*

 * We need to always use 64bit version because the structure

 * is shared across entire cluster where 32bit and 64bit machines

 * are co-existing.

 */

#if __BITS_PER_LONG != 64 || defined(__ARCH_WANT_STAT64)

typedef struct stat64   lstat_t;

#define lstat_f	 lstat64

#else

typedef struct stat     lstat_t;

#define lstat_f	 lstat

#endif



#define HAVE_LOV_USER_MDS_DATA



#endif /* _LUSTRE_USER_H */

drivers/staging/lustre/lustre/include/lustre/lustre_user.h

+26 −1
Original line number Diff line number Diff line
@@ -42,8 +42,33 @@ 
 * @{

 */



#ifdef __KERNEL__

# include <linux/quota.h>

# include <linux/string.h> /* snprintf() */

# include <linux/version.h>

#else /* !__KERNEL__ */

# define NEED_QUOTA_DEFS

# include <stdio.h> /* snprintf() */

# include <string.h>

# include <sys/quota.h>

# include <sys/stat.h>

#endif /* __KERNEL__ */

#include "ll_fiemap.h"

#include "../linux/lustre_user.h"



/*

 * We need to always use 64bit version because the structure

 * is shared across entire cluster where 32bit and 64bit machines

 * are co-existing.

 */

#if __BITS_PER_LONG != 64 || defined(__ARCH_WANT_STAT64)

typedef struct stat64   lstat_t;

#define lstat_f  lstat64

#else

typedef struct stat     lstat_t;

#define lstat_f  lstat

#endif



#define HAVE_LOV_USER_MDS_DATA



#define LUSTRE_EOF 0xffffffffffffffffULL

drivers/staging/lustre/lustre/include/linux/lustre_compat25.h→drivers/staging/lustre/lustre/include/lustre_compat.h

+3 −3
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
 * Lustre is a trademark of Sun Microsystems, Inc.

 */



#ifndef _LINUX_COMPAT25_H

#define _LINUX_COMPAT25_H

#ifndef _LUSTRE_COMPAT_H

#define _LUSTRE_COMPAT_H



#include <linux/fs_struct.h>

#include <linux/namei.h>
@@ -74,4 +74,4 @@ 
# define ext2_find_next_zero_bit  find_next_zero_bit_le

#endif



#endif /* _COMPAT25_H */
 
#endif /* _LUSTRE_COMPAT_H */