From patchwork Wed Apr 13 09:12:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Philipp X-Patchwork-Id: 703391 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 p3D9CbAn031896 for ; Wed, 13 Apr 2011 09:12:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757976Ab1DMJMe (ORCPT ); Wed, 13 Apr 2011 05:12:34 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:63952 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757972Ab1DMJMb (ORCPT ); Wed, 13 Apr 2011 05:12:31 -0400 Received: by wya21 with SMTP id 21so311128wya.19 for ; Wed, 13 Apr 2011 02:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=0KWKdMMX41dY5UZqMlqWdYk4bGrxiej7FKv1cAGwG0c=; b=TcNXb3wgOciKcvOVJDs8RkH2eObF0xXo7U+JHt6AdLJkQj209Pv+dcfm9/ul2+Keoe C+sl7EAZ3khiQ0q5D8h30i05BsNdEFT8aby2vHpDdU9wPJ2Yv0enekkf4qbmJwzzdDIH BlNATast7979b70qbN4GkcBY3QhUCPxEWo74U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=ZpKe+E70fv3vRqT3XyhFGYtePGEgLV4Gr9C/Yrmokdtf0da2FNPgS7hJw+heb5GHcb 5DV3rZCp5BKKuWT4OhDAWKYpfn0/7Te+Pr0un7dhjoyeeI2NuzL+s+Roxb6g/Kj2H9gD Ede0dbXeoowkanbOBUqWl9PKnRKyxRwvu/xXM= Received: by 10.216.145.92 with SMTP id o70mr6958245wej.86.1302685950692; Wed, 13 Apr 2011 02:12:30 -0700 (PDT) Received: from localhost.localdomain (84-119-52-190.dynamic.xdsl-line.inode.at [84.119.52.190]) by mx.google.com with ESMTPS id d54sm148184wej.10.2011.04.13.02.12.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 13 Apr 2011 02:12:30 -0700 (PDT) From: Andreas Philipp To: linux-btrfs@vger.kernel.org Cc: Andreas Philipp , lizf@cn.fujitsu.com Subject: [PATCH 3/5] Added support for an additional ioctl. Date: Wed, 13 Apr 2011 11:12:12 +0200 Message-Id: <1302685934-15737-4-git-send-email-philipp.andreas@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1302685934-15737-1-git-send-email-philipp.andreas@gmail.com> References: <1302685934-15737-1-git-send-email-philipp.andreas@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 13 Apr 2011 09:12:38 +0000 (UTC) Added BTRFS_IOC_SNAP_CREATE_V2 and struct btrfs_ioctl_vol_args_v2 as defined in fs/btrfs/ioctl.h in the kernel sources. Signed-off-by: Andreas Philipp --- ioctl.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ioctl.h b/ioctl.h index 776d7a9..358f814 100644 --- a/ioctl.h +++ b/ioctl.h @@ -30,6 +30,17 @@ struct btrfs_ioctl_vol_args { char name[BTRFS_PATH_NAME_MAX + 1]; }; +#define BTRFS_SUBVOL_RDONLY (1ULL << 1) +#define BTRFS_SUBVOL_NAME_MAX 4039 + +struct btrfs_ioctl_vol_args_v2 { + __s64 fd; + __u64 transid; + __u64 flags; + __u64 unused[4]; + char name[BTRFS_SUBVOL_NAME_MAX + 1]; +}; + struct btrfs_ioctl_search_key { /* which root are we searching. 0 is the tree of tree roots */ __u64 tree_id; @@ -132,6 +143,7 @@ struct btrfs_ioctl_space_args { struct btrfs_ioctl_space_info spaces[0]; }; +/* BTRFS_IOC_SNAP_CREATE is no longer used by the btrfs command */ #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ struct btrfs_ioctl_vol_args) #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \ @@ -169,4 +181,6 @@ struct btrfs_ioctl_space_args { #define BTRFS_IOC_DEFAULT_SUBVOL _IOW(BTRFS_IOCTL_MAGIC, 19, u64) #define BTRFS_IOC_SPACE_INFO _IOWR(BTRFS_IOCTL_MAGIC, 20, \ struct btrfs_ioctl_space_args) +#define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, \ + struct btrfs_ioctl_vol_args_v2) #endif