diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-07-12 06:34:42 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-07-12 06:34:42 -0400 |
commit | f2006e27396f55276f24434f56e208d86e7f9908 (patch) | |
tree | 71896db916d33888b4286f80117d3cac0da40e6d /include/linux/ceph/decode.h | |
parent | e399eb56a6110e13f97e644658648602e2b08de7 (diff) | |
parent | 9903883f1dd6e86f286b7bfa6e4b423f98c1cd9e (diff) |
Merge branch 'linus' into timers/urgent
Get upstream changes so we can apply fixes against them
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/ceph/decode.h')
-rw-r--r-- | include/linux/ceph/decode.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h index 379f71508995..0442c3d800f0 100644 --- a/include/linux/ceph/decode.h +++ b/include/linux/ceph/decode.h | |||
@@ -160,11 +160,6 @@ static inline void ceph_decode_timespec(struct timespec *ts, | |||
160 | static inline void ceph_encode_timespec(struct ceph_timespec *tv, | 160 | static inline void ceph_encode_timespec(struct ceph_timespec *tv, |
161 | const struct timespec *ts) | 161 | const struct timespec *ts) |
162 | { | 162 | { |
163 | BUG_ON(ts->tv_sec < 0); | ||
164 | BUG_ON(ts->tv_sec > (__kernel_time_t)U32_MAX); | ||
165 | BUG_ON(ts->tv_nsec < 0); | ||
166 | BUG_ON(ts->tv_nsec > (long)U32_MAX); | ||
167 | |||
168 | tv->tv_sec = cpu_to_le32((u32)ts->tv_sec); | 163 | tv->tv_sec = cpu_to_le32((u32)ts->tv_sec); |
169 | tv->tv_nsec = cpu_to_le32((u32)ts->tv_nsec); | 164 | tv->tv_nsec = cpu_to_le32((u32)ts->tv_nsec); |
170 | } | 165 | } |