From 21e8109b08ea720956448b50e1ac3f8ddcde2743 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 14 May 2012 12:34:50 -0700
Subject: [PATCH] --- yaml --- r: 309459 b: refs/heads/master c:
 c047be09349752b8a4dac27bc9f130bf4d592f11 h: refs/heads/master i:   309457:
 e6bf2738b05f7952c51a34505fc9eeb2a9d45910   309455:
 01cd489714cf9bfa661f4300d6cb5e50ce3f24ef v: v3

---
 [refs]                | 2 +-
 trunk/fs/ceph/ioctl.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

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) ||