From: pschwan <pschwan>
Date: Sun, 27 Apr 2003 21:52:52 +0000 (+0000)
Subject: b=1178
X-Git-Tag: v1_7_110~2^11~139
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=08200a0f9a4d2b30bf9daee93a7d6c2b2ab04d68;p=fs%2Flustre-release.git

b=1178
- Preparations for removing unused "addr" from lustre_handle
- remove ioc_addr from kernel/userspace communications
---

diff --git a/lustre/utils/obdiolib.h b/lustre/utils/obdiolib.h
index 9b06941..3811b41 100644
--- a/lustre/utils/obdiolib.h
+++ b/lustre/utils/obdiolib.h
@@ -2,7 +2,7 @@
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
  *  Copyright (C) 2003 Cluster File Systems, Inc.
- *   Author: Eric Barton <eeb@clusterfs.com> 
+ *   Author: Eric Barton <eeb@clusterfs.com>
  *
  *   This file is part of Lustre, http://www.lustre.org.
  *
@@ -33,8 +33,7 @@
 #include <linux/obd_class.h>
 
 struct obdio_conn {
-        int	               oc_fd;
-        uint64_t               oc_conn_addr;
+        int                    oc_fd;
         uint64_t               oc_conn_cookie;
         struct obd_ioctl_data  oc_data;
         char                   oc_buffer[8192];
@@ -42,25 +41,25 @@ struct obdio_conn {
 
 struct obdio_barrier {
         uint64_t               ob_id;
-	uint64_t               ob_oid;
+        uint64_t               ob_oid;
         uint64_t               ob_npeers;
         uint64_t               ob_ordinal;
         uint64_t               ob_count;
 };
-	
+
 extern struct obdio_conn * obdio_connect (int device);
 extern void obdio_disconnect (struct obdio_conn *conn);
-extern int obdio_open (struct obdio_conn *conn, uint64_t oid, 
-		       struct lustre_handle *fh);
-extern int obdio_close (struct obdio_conn *conn, uint64_t oid, 
-			struct lustre_handle *fh);
-extern int obdio_pread (struct obdio_conn *conn, uint64_t oid, 
-			char *buffer, uint32_t count, uint64_t offset);
-extern int obdio_pwrite (struct obdio_conn *conn, uint64_t oid, 
-			 char *buffer, uint32_t count, uint64_t offset);
+extern int obdio_open (struct obdio_conn *conn, uint64_t oid,
+                       struct lustre_handle *fh);
+extern int obdio_close (struct obdio_conn *conn, uint64_t oid,
+                        struct lustre_handle *fh);
+extern int obdio_pread (struct obdio_conn *conn, uint64_t oid,
+                        char *buffer, uint32_t count, uint64_t offset);
+extern int obdio_pwrite (struct obdio_conn *conn, uint64_t oid,
+                         char *buffer, uint32_t count, uint64_t offset);
 extern int obdio_enqueue (struct obdio_conn *conn, uint64_t oid,
-			  int mode, uint64_t offset, uint32_t count,
-			  struct lustre_handle *lh);
+                          int mode, uint64_t offset, uint32_t count,
+                          struct lustre_handle *lh);
 extern int obdio_cancel (struct obdio_conn *conn, struct lustre_handle *lh);
 extern void *obdio_alloc_aligned_buffer (void **spacep, int size);
 extern struct obdio_barrier *obdio_new_barrier (uint64_t oid, uint64_t id, int npeers) ;