diff --git a/[refs] b/[refs]
index 3736285e67a7..57462714c796 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 702aeb1f88e707241d76e1e2a1a02dd81e6c2d77
+refs/heads/master: c047be09349752b8a4dac27bc9f130bf4d592f11
diff --git a/trunk/fs/ceph/ioctl.c b/trunk/fs/ceph/ioctl.c
index c0b7314b90f9..8e3fb69fbe62 100644
--- a/trunk/fs/ceph/ioctl.c
+++ b/trunk/fs/ceph/ioctl.c
@@ -39,10 +39,6 @@ static long __validate_layout(struct ceph_mds_client *mdsc,
 {
 	int i, err;
 
-	/* preferred_osd is no longer supported */
-	if (l->preferred_osd != -1)
-		return -EINVAL;
-
 	/* validate striping parameters */
 	if ((l->object_size & ~PAGE_MASK) ||
 	    (l->stripe_unit & ~PAGE_MASK) ||