From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 14 May 2010 20:42:07 +0000 (-0700)
Subject: mds: replace accidnetal __u64 with uint64_t
X-Git-Tag: v0.22~346^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4e9e4c0187ed6457ab76683728a27393caf2677;p=ceph.git

mds: replace accidnetal __u64 with uint64_t
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 9b26d665ea23..54214b98952f 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1993,7 +1993,7 @@ bool Locker::_do_cap_update(CInode *in, Capability *cap,
       ceph_filelock decoded_lock;
       ::decode(decoded_lock, bli);
       in->fcntl_locks.held_locks.
-	insert(pair<__u64, ceph_filelock>(decoded_lock.start, decoded_lock));
+	insert(pair<uint64_t, ceph_filelock>(decoded_lock.start, decoded_lock));
       ++in->fcntl_locks.client_held_lock_counts[decoded_lock.client];
     }
     ::decode(num_locks, bli);
@@ -2001,7 +2001,7 @@ bool Locker::_do_cap_update(CInode *in, Capability *cap,
       ceph_filelock decoded_lock;
       ::decode(decoded_lock, bli);
       in->flock_locks.held_locks.
-	insert(pair<__u64, ceph_filelock>(decoded_lock.start, decoded_lock));
+	insert(pair<uint64_t, ceph_filelock>(decoded_lock.start, decoded_lock));
       ++in->flock_locks.client_held_lock_counts[decoded_lock.client];
     }
   }