Pass 64-bit RPC XIDs around, since this is really how big they are.

diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index c758880..08ea7ea 100644 (file)
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -152,7 +152,7 @@ int mdc_getlovinfo(struct obd_device *obd, struct lustre_handle *mdc_connh,
                    uuid_t **uuids, struct ptlrpc_request **request);
 int mdc_getstatus(struct lustre_handle *conn,
                   struct ll_fid *rootfid, __u64 *last_committed,
-                  __u32 *last_xid, struct ptlrpc_request **);
+                  __u64 *last_xid, struct ptlrpc_request **);
 int mdc_getattr(struct lustre_handle *conn,
                 obd_id ino, int type, unsigned long valid, size_t ea_size,
                 struct ptlrpc_request **request);

diff --git a/lustre/llite/recover.c b/lustre/llite/recover.c
index 8de4907..1785d29 100644 (file)
--- a/lustre/llite/recover.c
+++ b/lustre/llite/recover.c
@@ -26,7 +26,7 @@ static int ll_reconnect(struct ll_sb_info *sbi)
 {
         struct ll_fid rootfid;
         __u64 last_committed;
-        __u32 last_xid;
+        __u64 last_xid;
         int err;
         struct ptlrpc_request *request; 
 
@@ -35,7 +35,7 @@ static int ll_reconnect(struct ll_sb_info *sbi)
         sbi2mdc(sbi)->cl_conn->c_level = LUSTRE_CONN_CON;
 
         /* XXX: need to store the last_* values somewhere */
-        err = mdc_getstatus(&sbi->ll_mdc_conn, &rootfid, &last_committed, 
+        err = mdc_getstatus(&sbi->ll_mdc_conn, &rootfid, &last_committed,
                             &last_xid, &request);
         if (err) {
                 CERROR("cannot mds_connect: rc = %d\n", err);

diff --git a/lustre/llite/super.c b/lustre/llite/super.c
index 8dd016d..0d7b872 100644 (file)
--- a/lustre/llite/super.c
+++ b/lustre/llite/super.c
@@ -89,7 +89,7 @@ static struct super_block * ll_read_super(struct super_block *sb,
         struct ll_fid rootfid;
         struct statfs sfs;
         __u64 last_committed;
-        __u32 last_xid;
+        __u64 last_xid;
         struct ptlrpc_request *request = NULL;
         struct ll_inode_md md;
         class_uuid_t uuid;

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 0d9fa7f..3f2dcc9 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -56,7 +56,7 @@ int mdc_con2cl(struct lustre_handle *conn, struct ptlrpc_client **cl,
 }
 
 int mdc_getstatus(struct lustre_handle *conn, struct ll_fid *rootfid,
-                  __u64 *last_committed, __u32 *last_xid,
+                  __u64 *last_committed, __u64 *last_xid,
                   struct ptlrpc_request **request)
 {
         struct ptlrpc_request *req;
@@ -83,9 +83,10 @@ int mdc_getstatus(struct lustre_handle *conn, struct ll_fid *rootfid,
                 *last_committed = req->rq_repmsg->last_committed;
                 *last_xid = req->rq_repmsg->last_xid;
 
-                CDEBUG(D_NET, "root ino=%ld, last_committed=%Lu, last_xid=%d\n",
+                CDEBUG(D_NET,"root ino=%ld, last_committed=%Lu, last_xid=%Ld\n",
                        (unsigned long)rootfid->id,
-                       (unsigned long long)*last_committed, *last_xid);
+                       (unsigned long long)*last_committed,
+                       (unsigned long long)*last_xid);
         }
 
         EXIT;