From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 29 Apr 2010 20:35:46 +0000 (-0700)
Subject: mds: ceph_filelock and filelock_change need to be explicitly sized
X-Git-Tag: v0.22~346^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d375ea7cf805b67a9615501dbeee3d80fbd61fe;p=ceph.git

mds: ceph_filelock and filelock_change need to be explicitly sized
---

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 8c4bc649ffd1..c90b1ea1471a 100644
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -376,11 +376,11 @@ union ceph_mds_request_args {
 	struct {
 		__u8 rule; /* currently fcntl or flock */
 		__u8 type; /* shared, exclusive, remove*/
-		int pid; /* process id requesting the lock */
+		__u64 pid; /* process id requesting the lock */
 		__u64 pid_namespace;
 		__u64 start; /* initial location to lock */
 		__u64 length; /* num bytes to lock from start */
-		bool wait; /* will caller wait for lock to become available? */
+		__u8 wait; /* will caller wait for lock to become available? */
 	} __attribute__ ((packed)) filelock_change;
 } __attribute__ ((packed));
 
@@ -487,7 +487,7 @@ struct ceph_filelock {
 	__u64 start;/* file offset to start lock at */
 	__u64 length; /* num bytes to lock; 0 for all following start */
 	__s64 client; /* which client holds the lock */
-	int pid; /* process id holding the lock on the client */
+	__u64 pid; /* process id holding the lock on the client */
 	__u64 pid_namespace;
 	__u8 type; /* shared lock, exclusive lock, or unlock */
 } __attribute__ ((packed));