diff --git a/[refs] b/[refs]
index 3e9e76a6f1db..45c2a0e6cff7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5b10629edfa521071ccdb3b1e0e7fb350a044db
+refs/heads/master: 1cd275f609ba46c8cae3ee77e499c54a0d13a983
diff --git a/trunk/fs/ceph/ioctl.h b/trunk/fs/ceph/ioctl.h
index a6ce54e94eb5..52e8fd74d450 100644
--- a/trunk/fs/ceph/ioctl.h
+++ b/trunk/fs/ceph/ioctl.h
@@ -4,7 +4,7 @@
 #include <linux/ioctl.h>
 #include <linux/types.h>
 
-#define CEPH_IOCTL_MAGIC 0x98
+#define CEPH_IOCTL_MAGIC 0x97
 
 /* just use u64 to align sanely on all archs */
 struct ceph_ioctl_layout {