LU-1330 obdclass: add obd_target.h

[fs/lustre-release.git] / lustre / include / obd_class.h

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index f710646..029b21e 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -230,21 +230,19 @@ extern void (*class_export_dump_hook)(struct obd_export *);
 
 #endif
 
-#define class_export_rpc_get(exp)                                       \
+#define class_export_rpc_inc(exp)                                       \
 ({                                                                      \
         cfs_atomic_inc(&(exp)->exp_rpc_count);                          \
         CDEBUG(D_INFO, "RPC GETting export %p : new rpc_count %d\n",    \
                (exp), cfs_atomic_read(&(exp)->exp_rpc_count));          \
-        class_export_get(exp);                                          \
 })
 
-#define class_export_rpc_put(exp)                                       \
+#define class_export_rpc_dec(exp)                                       \
 ({                                                                      \
         LASSERT_ATOMIC_POS(&exp->exp_rpc_count);                        \
         cfs_atomic_dec(&(exp)->exp_rpc_count);                          \
         CDEBUG(D_INFO, "RPC PUTting export %p : new rpc_count %d\n",    \
                (exp), cfs_atomic_read(&(exp)->exp_rpc_count));          \
-        class_export_put(exp);                                          \
 })
 
 #define class_export_lock_get(exp, lock)                                \
@@ -1205,24 +1203,13 @@ static inline int obd_extent_calc(struct obd_export *exp,
 }
 
 static inline struct dentry *
-obd_lvfs_fid2dentry(struct obd_export *exp, __u64 id_ino, __u32 gen, __u64 gr)
+obd_lvfs_fid2dentry(struct obd_export *exp, struct ost_id *oi, __u32 gen)
 {
        struct lvfs_run_ctxt *ctxt = &exp->exp_obd->obd_lvfs_ctxt;
        LASSERT(exp->exp_obd);
 
-       return ctxt->cb_ops.l_fid2dentry(id_ino, gen, gr, exp->exp_obd);
-}
-
-static inline int
-obd_lvfs_open_llog(struct obd_export *exp, __u64 id_ino, struct dentry *dentry)
-{
-        LASSERT(exp->exp_obd);
-        CERROR("FIXME what's the story here?  This needs to be an obd fn?\n");
-#if 0
-        return lvfs_open_llog(&exp->exp_obd->obd_lvfs_ctxt, id_ino,
-                              dentry, exp->exp_obd);
-#endif
-        return 0;
+       return ctxt->cb_ops.l_fid2dentry(ostid_id(oi), gen, ostid_seq(oi),
+                                        exp->exp_obd);
 }
 
 /* @max_age is the oldest time in jiffies that we accept using a cached data.
@@ -2251,11 +2238,11 @@ extern int obd_init_caches(void);
 extern void obd_cleanup_caches(void);
 
 /* support routines */
-extern cfs_mem_cache_t *obdo_cachep;
+extern struct kmem_cache *obdo_cachep;
 
 #define OBDO_ALLOC(ptr)                                                       \
 do {                                                                          \
-        OBD_SLAB_ALLOC_PTR_GFP((ptr), obdo_cachep, CFS_ALLOC_IO);             \
+       OBD_SLAB_ALLOC_PTR_GFP((ptr), obdo_cachep, __GFP_IO);             \
 } while(0)
 
 #define OBDO_FREE(ptr)                                                        \
@@ -2291,11 +2278,12 @@ struct lwp_register_item {
 extern int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c);
 
 /* obd_mount.c */
-int server_name2fsname(char *svname, char *fsname, char **endptr);
-int lustre_register_lwp_item(char *lwpname, struct obd_export **exp,
+#ifdef HAVE_SERVER_SUPPORT
+int lustre_register_lwp_item(const char *lwpname, struct obd_export **exp,
                             register_lwp_cb cb_func, void *cb_data);
 void lustre_deregister_lwp_item(struct obd_export **exp);
-int tgt_name2lwpname(char *tgt_name, char *lwp_name);
+int tgt_name2lwpname(const char *tgt_name, char *lwp_name);
+#endif /* HAVE_SERVER_SUPPORT */
 
 /* sysctl.c */
 extern void obd_sysctl_init (void);