Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging/lustre: remove lvfs.h 



Move the definition of struct lvfs_run_ctxt to the one file that
needed it (lustre/include/obd.h). Remove the then unneeded headers
lustre/include/lvfs.h and lustre/include/linux/lvfs.h.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
 * super-class definitions.

 */

#include "lu_object.h"

#include "lvfs.h"

#include "linux/lustre_compat25.h"

#include <linux/mutex.h>

#include <linux/radix-tree.h>

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

deleted100644 → 0
+0 −57
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) 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/lvfs.h

 *

 * lustre VFS/process permission interface

 */



#ifndef __LINUX_LVFS_H__

#define __LINUX_LVFS_H__



#ifndef __LVFS_H__

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

#endif



#include <linux/kernel.h>

#include <linux/fs.h>

#include <linux/sched.h>

#include "lustre_compat25.h"



struct lvfs_run_ctxt {

	struct dt_device	*dt;

};



#endif

drivers/staging/lustre/lustre/include/lvfs.h

deleted100644 → 0
+0 −45
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) 2007, 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.

 *

 * lustre/include/lvfs.h

 *

 * lustre VFS/process permission interface

 */



#ifndef __LVFS_H__

#define __LVFS_H__



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

#include "linux/lvfs.h"



#endif

drivers/staging/lustre/lustre/include/obd.h

+4 −0
Original line number Diff line number Diff line
@@ -800,6 +800,10 @@ struct obd_llog_group { 
#define OBD_DEVICE_MAGIC	0XAB5CD6EF

#define OBD_DEV_BY_DEVNAME      0xffffd0de



struct lvfs_run_ctxt {

	struct dt_device *dt;

};



struct obd_device {

	struct obd_type	*obd_type;

	__u32		   obd_magic;

drivers/staging/lustre/lustre/include/obd_support.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#include <linux/slab.h>

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

#include "lvfs.h"

#include "linux/lustre_compat25.h"

#include "lprocfs_status.h"



/* global variables */