From 8bc36349cbee3fb3e532cb6bedabd7ed6e6de3c6 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 26 Jul 2011 04:52:22 -0400
Subject: [PATCH] --- yaml --- r: 280277 b: refs/heads/master c:
 5706b27deae29ceee26d0c20112f087a9b841575 h: refs/heads/master i:   280275:
 33dca544f28683fb6d69927dbc902c808ecd2bb3 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ceph/caps.c  | 4 ++--
 trunk/fs/ceph/super.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f5ff3d0c82fa..7ea99486f922 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 138d570de290ee7dbb18ef75d4f5735340352c56
+refs/heads/master: 5706b27deae29ceee26d0c20112f087a9b841575
diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c
index 8b53193e4f7c..b60fc8bfb3e9 100644
--- a/trunk/fs/ceph/caps.c
+++ b/trunk/fs/ceph/caps.c
@@ -928,7 +928,7 @@ static int send_cap_msg(struct ceph_mds_session *session,
 			u64 size, u64 max_size,
 			struct timespec *mtime, struct timespec *atime,
 			u64 time_warp_seq,
-			uid_t uid, gid_t gid, mode_t mode,
+			uid_t uid, gid_t gid, umode_t mode,
 			u64 xattr_version,
 			struct ceph_buffer *xattrs_buf,
 			u64 follows)
@@ -1078,7 +1078,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
 	u64 size, max_size;
 	struct timespec mtime, atime;
 	int wake = 0;
-	mode_t mode;
+	umode_t mode;
 	uid_t uid;
 	gid_t gid;
 	struct ceph_mds_session *session;
diff --git a/trunk/fs/ceph/super.h b/trunk/fs/ceph/super.h
index edcbf3774a56..cb3652b37271 100644
--- a/trunk/fs/ceph/super.h
+++ b/trunk/fs/ceph/super.h
@@ -136,7 +136,7 @@ struct ceph_cap_snap {
 	int issued, dirty;
 	struct ceph_snap_context *context;
 
-	mode_t mode;
+	umode_t mode;
 	uid_t uid;
 	gid_t gid;