diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 14:29:43 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 14:29:43 +0400 |
commit | f94f3cb37a1c4d44dd2070cc4a6165689bda9c92 (patch) | |
tree | 21bbdeacbc1b9895cf917231d1675eaaa63b9229 /include/linux/ceph/libceph.h | |
parent | e27808df97ff7b43b4927aadf410705f33313523 (diff) | |
parent | 1b4610ebf37a05a65e9f29cdf4d87c207573104d (diff) | |
download | linux-f94f3cb37a1c4d44dd2070cc4a6165689bda9c92.tar.xz |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'include/linux/ceph/libceph.h')
-rw-r--r-- | include/linux/ceph/libceph.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h index 72c72bfccb88..0d2e0fffb470 100644 --- a/include/linux/ceph/libceph.h +++ b/include/linux/ceph/libceph.h @@ -71,7 +71,6 @@ struct ceph_options { #define CEPH_OSD_TIMEOUT_DEFAULT 60 /* seconds */ #define CEPH_OSD_KEEPALIVE_DEFAULT 5 #define CEPH_OSD_IDLE_TTL_DEFAULT 60 -#define CEPH_MOUNT_RSIZE_DEFAULT (512*1024) /* readahead */ #define CEPH_MSG_MAX_FRONT_LEN (16*1024*1024) #define CEPH_MSG_MAX_DATA_LEN (16*1024*1024) |