From patchwork Sat Dec 4 23:17:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Watkins X-Patchwork-Id: 380541 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB531mf1006973 for ; Sun, 5 Dec 2010 03:02:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755170Ab0LDXRw (ORCPT ); Sat, 4 Dec 2010 18:17:52 -0500 Received: from mail-01.cse.ucsc.edu ([128.114.48.32]:44109 "EHLO mail-01.cse.ucsc.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755025Ab0LDXRw convert rfc822-to-8bit (ORCPT ); Sat, 4 Dec 2010 18:17:52 -0500 Received: from [192.168.51.138] (soenat3.cse.ucsc.edu [128.114.60.41]) by mail-01.cse.ucsc.edu (Postfix) with ESMTP id 438987744003; Sat, 4 Dec 2010 15:17:52 -0800 (PST) From: Noah Watkins Subject: ioctl compatibility Date: Sat, 4 Dec 2010 15:17:51 -0800 Message-Id: Cc: Gregory Farnum To: ceph-devel@vger.kernel.org Mime-Version: 1.0 (Apple Message framework v1081) X-Mailer: Apple Mail (2.1081) Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 05 Dec 2010 03:02:05 +0000 (UTC) --- a/fs/ceph/ioctl.h +++ b/fs/ceph/ioctl.h @@ -4,7 +4,7 @@ #include #include -#define CEPH_IOCTL_MAGIC 0x97 +#define CEPH_IOCTL_MAGIC 0x98 /* just use u64 to align sanely on all archs */ struct ceph_ioctl_layout { @@ -17,6 +17,8 @@ struct ceph_ioctl_layout { struct ceph_ioctl_layout) #define CEPH_IOC_SET_LAYOUT _IOW(CEPH_IOCTL_MAGIC, 2, \ struct ceph_ioctl_layout) +#define CEPH_IOC_SET_LAYOUT_POLICY _IOW(CEPH_IOCTL_MAGIC, 5, \ + struct ceph_ioctl_layout) /* * Extract identity, address of the OSD and object storing a given--