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

Commit 49126e47 authored by Xiong Zhou's avatar Xiong Zhou Committed by Greg Kroah-Hartman
Browse files

staging/lustre: lloop depends on BLOCK 



Add a config option for llite/lloop in lustre driver, making it depends
on BLOCK to fix this better:
drivers/staging/lustre/lustre/fid/../include/linux/lustre_compat25.h:117:2:
error: implicit declaration of function ‘unregister_blkdev'

Also, remove the wrapper ll_unregister_blkdev which depends on BLOCK in
the header and just call unregister_blkdev in lloop.c based on Peng Tao's
comment. Drop the redundant dependency on STAGING for LUSTRE_FS, remove
some unnecessary jdb header files which depends on BLOCK btw.

Signed-off-by: default avatarXiong Zhou <jencce.kernel@gmail.com>
Reviewed-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b50c460a

drivers/staging/lustre/lustre/Kconfig

+6 −1
Original line number Diff line number Diff line 
config LUSTRE_FS

	tristate "Lustre file system client support"

	depends on STAGING && INET && BLOCK && m

	depends on INET && m

	select LNET

	select CRYPTO

	select CRYPTO_CRC32
@@ -53,3 +53,8 @@ config LUSTRE_TRANSLATE_ERRNOS 
	bool

	depends on LUSTRE_FS && !X86

	default true



config LUSTRE_LLITE_LLOOP

	bool "Lustre virtual block device"

	depends on LUSTRE_FS && BLOCK

	default m

drivers/staging/lustre/lustre/fld/fld_cache.c

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


# include <linux/libcfs/libcfs.h>

# include <linux/module.h>

# include <linux/jbd.h>

# include <asm/div64.h>



#include <obd.h>

drivers/staging/lustre/lustre/fld/fld_request.c

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


# include <linux/libcfs/libcfs.h>

# include <linux/module.h>

# include <linux/jbd.h>

# include <asm/div64.h>



#include <obd.h>

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

+0 −7
Original line number Diff line number Diff line
@@ -111,13 +111,6 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, 
#define TREE_READ_LOCK_IRQ(mapping)	spin_lock_irq(&(mapping)->tree_lock)

#define TREE_READ_UNLOCK_IRQ(mapping)	spin_unlock_irq(&(mapping)->tree_lock)



static inline

int ll_unregister_blkdev(unsigned int dev, const char *name)

{

	unregister_blkdev(dev, name);

	return 0;

}



#define ll_invalidate_bdev(a,b)	 invalidate_bdev((a))



#ifndef FS_HAS_FIEMAP

drivers/staging/lustre/lustre/llite/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_LUSTRE_FS) += lustre.o

obj-$(CONFIG_LUSTRE_FS) += llite_lloop.o

obj-$(CONFIG_LUSTRE_LLITE_LLOOP) += llite_lloop.o

lustre-y := dcache.o dir.o file.o llite_close.o llite_lib.o llite_nfs.o \

	    rw.o lproc_llite.o namei.o symlink.o llite_mmap.o \

	    xattr.o remote_perm.o llite_rmtacl.o llite_capa.o \