diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-11 07:10:08 +0300 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-11 07:10:08 +0300 |
| commit | eed0ba0b4ab2d1668588219a8efa81bf8636a12d (patch) | |
| tree | f5aa3c732e7830a1b24e6071f8bed0f799881187 /fs/ceph/ioctl.h | |
| parent | 98b14d6b290d96b24ae993ceaccc59b2aa4b130c (diff) | |
| parent | c9de9333f5a860cab82052bce6ac28bcac9b2c26 (diff) | |
| download | linux-eed0ba0b4ab2d1668588219a8efa81bf8636a12d.tar.xz | |
Merge remote branch 'gcl/next' into next
Diffstat (limited to 'fs/ceph/ioctl.h')
| -rw-r--r-- | fs/ceph/ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/ioctl.h b/fs/ceph/ioctl.h index a6ce54e94eb5..52e8fd74d450 100644 --- a/fs/ceph/ioctl.h +++ b/fs/ceph/ioctl.h @@ -4,7 +4,7 @@ #include <linux/ioctl.h> #include <linux/types.h> -#define CEPH_IOCTL_MAGIC 0x98 +#define CEPH_IOCTL_MAGIC 0x97 /* just use u64 to align sanely on all archs */ struct ceph_ioctl_layout { |