[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lustre-cvs
Subject:    [Lustre-cvs] CVS: obd/include/linux lustre_lite.h,1.9,1.10 obd.h,1.20,1.21 obd_support.h,1.52,1.53
From:       Phil Schwan <pschwan () users ! sourceforge ! net>
Date:       2002-04-29 22:04:42
[Download RAW message or body]

Update of /cvsroot/lustre/obd/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv977/include/linux

Modified Files:
	lustre_lite.h obd.h obd_support.h 
Log Message:
Trivial whitespace, struct, etc changes to bring the ldlm_testing branch more in
line with the trunk.


Index: lustre_lite.h
===================================================================
RCS file: /cvsroot/lustre/obd/include/linux/lustre_lite.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lustre_lite.h	29 Apr 2002 20:36:24 -0000	1.9
+++ lustre_lite.h	29 Apr 2002 22:04:39 -0000	1.10
@@ -46,8 +46,7 @@
         ino_t                     ll_rootino; /* number of root inode */
         struct ptlrpc_client      ll_mds_client;
         struct ptlrpc_connection *ll_mds_conn;
-        struct ptlrpc_client      ll_ost_client;
-        struct ptlrpc_connection *ll_ost_conn;
+        struct ldlm_namespace    *ll_namespace;
 
         wait_queue_head_t         ll_commitcbd_waitq;
         wait_queue_head_t         ll_commitcbd_ctl_waitq;

Index: obd.h
===================================================================
RCS file: /cvsroot/lustre/obd/include/linux/obd.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- obd.h	29 Apr 2002 20:36:24 -0000	1.20
+++ obd.h	29 Apr 2002 22:04:40 -0000	1.21
@@ -175,6 +175,7 @@
         struct list_head obd_gen_clients;
         struct list_head obd_req_list;
         wait_queue_head_t obd_req_waitq;
+        struct ldlm_namespace *obd_namespace;
         union {
                 struct ext2_obd ext2;
                 struct filter_obd filter;
@@ -240,6 +241,12 @@
         int (*o_commitrw)(int cmd, struct obd_conn *conn,
                           int objcount, struct obd_ioobj *obj,
                           int niocount, struct niobuf *res);
+        int (*o_enqueue)(struct obd_conn *conn, struct ldlm_namespace *ns,
+                         struct ldlm_handle *parent_lock, __u64 *res_id,
+                         __u32 type, struct ldlm_extent *, __u32 mode,
+                         int *flags, void *data, int datalen,
+                         struct ldlm_handle *lockh);
+        int (*o_cancel)(struct obd_conn *, __u32 mode, struct ldlm_handle *);
 };
 
 #endif

Index: obd_support.h
===================================================================
RCS file: /cvsroot/lustre/obd/include/linux/obd_support.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- obd_support.h	29 Apr 2002 20:36:24 -0000	1.52
+++ obd_support.h	29 Apr 2002 22:04:40 -0000	1.53
@@ -119,28 +119,28 @@
         }
 }
 
-#define OBD_ALLOC(ptr, size)                                    \
-do {                                                            \
-        long s = (size);                                        \
-        (ptr) = kmalloc(s, GFP_KERNEL);                         \
-        if ((ptr) == NULL) {                                    \
-                CERROR("kmalloc of '" #ptr "' (%ld bytes) failed " \
-                       "at %s:%d\n", s, __FILE__, __LINE__);    \
-        } else {                                                \
-                memset((ptr), 0, s);                            \
-                obd_memory += s;                                \
-                CDEBUG(D_MALLOC, "kmalloced '" #ptr "': %ld at "\
-                       "%p (tot %ld).\n", s, (ptr), obd_memory);\
-        }                                                       \
+#define OBD_ALLOC(ptr, size)                                            \
+do {                                                                    \
+        long s = (size);                                                \
+        (ptr) = kmalloc(s, GFP_KERNEL);                                 \
+        if ((ptr) == NULL) {                                            \
+                CERROR("kmalloc of '" #ptr "' (%ld bytes) failed "      \
+                       "at %s:%d\n", s, __FILE__, __LINE__);            \
+        } else {                                                        \
+                memset((ptr), 0, s);                                    \
+                obd_memory += s;                                        \
+                CDEBUG(D_MALLOC, "kmalloced '" #ptr "': %ld at "        \
+                       "%p (tot %ld).\n", s, (ptr), obd_memory);        \
+        }                                                               \
 } while (0)
 
-#define OBD_FREE(ptr, size)                                     \
-do {                                                            \
-        int s = (size);                                         \
-        kfree((ptr));                                           \
-        CDEBUG(D_MALLOC, "kfreed '" #ptr "': %d at %p (tot %ld).\n",       \
-               s, (ptr), obd_memory);                      \
-        obd_memory -= s;                                        \
+#define OBD_FREE(ptr, size)                                             \
+do {                                                                    \
+        int s = (size);                                                 \
+        kfree((ptr));                                                   \
+        CDEBUG(D_MALLOC, "kfreed '" #ptr "': %d at %p (tot %ld).\n",    \
+               s, (ptr), obd_memory);                                   \
+        obd_memory -= s;                                                \
 } while (0)
 
 #endif


_______________________________________________
Lustre-cvs mailing list
Lustre-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lustre-cvs
[prev in list] [next in list] [prev in thread] [next in thread]