From 07d3fd69d7cb134d900738cbe8dde081dff0bc01 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 4 Nov 2009 11:40:05 -0800
Subject: [PATCH] --- yaml --- r: 188605 b: refs/heads/master c:
 6a18be16f7513ea8a4923c161ce073987932cbdb h: refs/heads/master i:   188603:
 a34213fb6450be019e528c138595e4d0cc00fb17 v: v3

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

diff --git a/[refs] b/[refs]
index 9f932727e24a..4d434c729f9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51042122d4f85e0f8ee577a4230f172fcc57c456
+refs/heads/master: 6a18be16f7513ea8a4923c161ce073987932cbdb
diff --git a/trunk/fs/ceph/file.c b/trunk/fs/ceph/file.c
index 1bd57c8953bf..fc8aff4767d3 100644
--- a/trunk/fs/ceph/file.c
+++ b/trunk/fs/ceph/file.c
@@ -52,7 +52,7 @@ prepare_open_request(struct super_block *sb, int flags, int create_mode)
 	req->r_fmode = ceph_flags_to_mode(flags);
 	req->r_args.open.flags = cpu_to_le32(flags);
 	req->r_args.open.mode = cpu_to_le32(create_mode);
-	req->r_args.open.preferred = -1;
+	req->r_args.open.preferred = cpu_to_le32(-1);
 out:
 	return req;
 }
diff --git a/trunk/fs/ceph/super.c b/trunk/fs/ceph/super.c
index 0ae40bad53c4..1ac7b07214f3 100644
--- a/trunk/fs/ceph/super.c
+++ b/trunk/fs/ceph/super.c
@@ -804,7 +804,7 @@ static int ceph_get_sb(struct file_system_type *fs_type,
 	struct ceph_client *client;
 	int err;
 	int (*compare_super)(struct super_block *, void *) = ceph_compare_super;
-	const char *path = 0;
+	const char *path = NULL;
 	struct ceph_mount_args *args;
 
 	dout("ceph_get_sb\n");