X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Fobd_snap_support.h;h=fd8baa4b4cd3ef7eff74e7c70335a73a83b7587c;hb=4b28597565a5e732e1bb2b6aecf25e71bfeacccc;hp=e7dd0125631920e5d236596a373ce89a7b29b74d;hpb=059b081ae9e55b4d040ab459727f600b47c15797;p=fs%2Flustre-release.git

diff --git a/lustre/include/linux/obd_snap_support.h b/lustre/include/linux/obd_snap_support.h
index e7dd012..fd8baa4 100644
--- a/lustre/include/linux/obd_snap_support.h
+++ b/lustre/include/linux/obd_snap_support.h
@@ -12,7 +12,7 @@
  * available snapshot slots (14 in 56 bytes vs. 7 in 56 bytes until we
  * increase the size of OBD_OBDMDSZ).
  */
-typedef ino_t	snap_id;
+typedef obd_id	snap_id;
 
 /* maximum number of snapshot tables we maintain in the kernel */
 #define SNAP_MAX_TABLES 8
@@ -60,8 +60,8 @@ struct snap_table {
 };
 
 struct snap_iterdata {
-	struct obd_conn *conn;
-	struct obd_conn *ch_conn;
+	struct lustre_handle *conn;
+	struct lustre_handle *ch_conn;
 	int index;
 	int previndex;
 	int currentindex;
@@ -69,11 +69,11 @@ struct snap_iterdata {
 	time_t prevtime;
 };
 
-inline struct obd_conn *child_conn(struct obd_conn *conn);
+inline struct lustre_handle *child_conn(struct lustre_handle *conn);
 int snap_deleteobj(obd_id id, obd_gr group, void *data);
 int snap_restoreobj(obd_id id, obd_gr group, void *data);
 int snap_printobj(obd_id id, obd_gr group, void *data);
-int snap_iocontrol(int cmd, struct obd_conn *conn, int len, void *karg, void *uarg);
+int snap_iocontrol(unsigned int cmd, struct lustre_handle *conn, int len, void *karg, void *uarg);
 
 /* In the future, this function may have to deal with offsets into the obdmd.
  * Currently, we assume we have the whole obdmd struct.