Land b_smallfix onto HEAD (20040512_1806)

[fs/lustre-release.git] / lustre / include / linux / lustre_idl.h

diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index 7479634..a56b143 100644 (file)
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -80,21 +80,6 @@
 /*
  *  GENERAL STUFF
  */
-struct obd_uuid {
-        __u8 uuid[40];
-};
-
-static inline int obd_uuid_equals(struct obd_uuid *u1, struct obd_uuid *u2)
-{
-        return strcmp(u1->uuid, u2->uuid) == 0;
-}
-
-static inline void obd_str2uuid(struct obd_uuid *uuid, char *tmp)
-{
-        strncpy(uuid->uuid, tmp, sizeof(*uuid));
-        uuid->uuid[sizeof(*uuid) - 1] = '\0';
-}
-
 /* FOO_REQUEST_PORTAL is for incoming requests on the FOO
  * FOO_REPLY_PORTAL   is for incoming replies on the FOO
  * FOO_BULK_PORTAL    is for incoming bulk on the FOO
@@ -525,11 +510,6 @@ struct ll_fid {
         __u32 f_type;
 };
 
-struct ll_recreate_obj {
-        __u64 lrc_id;
-        __u32 lrc_ost_idx;
-};
-
 extern void lustre_swab_ll_fid (struct ll_fid *fid);
 
 #define MDS_STATUS_CONN 1
@@ -973,33 +953,6 @@ struct llog_lru_rec {
         struct llog_rec_tail    llr_tail;
 } __attribute__((packed));
 
-/* got from mds_update_record. FIXME: maybe some attribute in reint_record and
-   update_record will be changed later. */
-/* XXX BUG 3188 -- must return to one set of structures. */
-
-struct update_record {
-        __u32 ur_opcode;
-        __u32 ur_fsuid;
-        __u32 ur_fsgid;
-        dev_t ur_rdev;
-        struct iattr ur_iattr;
-        struct iattr ur_pattr; 
-        __u32 ur_flags;
-        __u32 ur_len;
-};
-struct reint_record {
-       struct update_record u_rec;
-       char *rec_data1;
-       int rec1_size;
-       char *rec_data2;
-       int rec2_size;
-};
-struct llog_smfs_rec {
-        struct llog_rec_hdr     lsr_hdr;
-        struct update_record    lsr_rec;
-        struct llog_rec_tail    lsr_tail;
-};
-
 /* On-disk header structure of each log object, stored in little endian order */
 #define LLOG_CHUNK_SIZE         8192
 #define LLOG_HEADER_SIZE        (96)