diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-09-24 10:00:58 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-09-24 10:00:58 -0400 |
| commit | 54bcf382daf08c1396edb8b81e650b58930ccaef (patch) | |
| tree | 64b941f09489b5c9ee63e4ad43d736bfce911b21 /fs/btrfs/ioctl.h | |
| parent | 94a8d5caba74211ec76dac80fc6e2d5c391530df (diff) | |
| parent | c65ddb52dc412c9b67681b1aa16cd1bac8434e24 (diff) | |
| download | lwn-54bcf382daf08c1396edb8b81e650b58930ccaef.tar.gz lwn-54bcf382daf08c1396edb8b81e650b58930ccaef.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/super.c
Diffstat (limited to 'fs/btrfs/ioctl.h')
| -rw-r--r-- | fs/btrfs/ioctl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h index b320b103fa13..bc49914475eb 100644 --- a/fs/btrfs/ioctl.h +++ b/fs/btrfs/ioctl.h @@ -65,5 +65,6 @@ struct btrfs_ioctl_clone_range_args { #define BTRFS_IOC_SUBVOL_CREATE _IOW(BTRFS_IOCTL_MAGIC, 14, \ struct btrfs_ioctl_vol_args) - +#define BTRFS_IOC_SNAP_DESTROY _IOW(BTRFS_IOCTL_MAGIC, 15, \ + struct btrfs_ioctl_vol_args) #endif |