diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-10-13 10:22:45 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-10-13 10:22:45 +1100 |
| commit | 6889e783cd68b79f8330ad4d10a2571c67c3f7df (patch) | |
| tree | 6ebb3900542a9d449e9c5d9b5191f35845f40130 /fs/xfs/xfs_linux.h | |
| parent | 75e58ce4c8f354f1a68a8bb8a9692827cdaf3d21 (diff) | |
| parent | a8b1ee8bafc765ebf029d03c5479a69aebff9693 (diff) | |
| download | op-kernel-dev-6889e783cd68b79f8330ad4d10a2571c67c3f7df.zip op-kernel-dev-6889e783cd68b79f8330ad4d10a2571c67c3f7df.tar.gz | |
Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_linux.h')
| -rw-r--r-- | fs/xfs/xfs_linux.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index d10dc8f..6a51619 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -56,7 +56,6 @@ typedef __uint64_t __psunsigned_t; #include "kmem.h" #include "mrlock.h" -#include "time.h" #include "uuid.h" #include <linux/semaphore.h> @@ -179,6 +178,11 @@ typedef __uint64_t __psunsigned_t; #define MAX(a,b) (max(a,b)) #define howmany(x, y) (((x)+((y)-1))/(y)) +static inline void delay(long ticks) +{ + schedule_timeout_uninterruptible(ticks); +} + /* * XFS wrapper structure for sysfs support. It depends on external data * structures and is embedded in various internal data structures to implement |
