staging/lustre/obdclass: add obd_target.h

Move some server-side data structures form obd.h to obd_target.h.  To
remove some code dependencies use HAVE_SERVER_SUPPORT to protect some
llog/fsfilt_* functions.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1330
Lustre-change: http://review.whamcloud.com/2678
Signed-off-by: Liu Xuezhao <xuezhao.liu@emc.com>
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Peng Tao <bergwolf@gmail.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h b/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
index 6c72609..e637006 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
@@ -145,16 +145,6 @@ static inline int fsfilt_commit(struct obd_device *obd, struct inode *inode,
        return rc;
 }
 
-static inline int fsfilt_map_inode_pages(struct obd_device *obd,
-                                        struct inode *inode,
-                                        struct page **page, int pages,
-                                        unsigned long *blocks,
-                                        int create, struct mutex *mutex)
-{
-       return obd->obd_fsops->fs_map_inode_pages(inode, page, pages, blocks,
-                                                 create, mutex);
-}
-
 static inline int fsfilt_read_record(struct obd_device *obd, struct file *file,
                                     void *buf, loff_t size, loff_t *offs)
 {

diff --cc drivers/staging/lustre/lustre/include/lprocfs_status.h
Simple merge

diff --cc drivers/staging/lustre/lustre/include/obd.h
Simple merge

diff --cc drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/Makefile
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/lprocfs_jobstats.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/obd_mount.c
Simple merge