diff options
author | Nathan Scott <nathans@sgi.com> | 2005-11-01 19:43:18 -0500 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2005-11-01 19:43:18 -0500 |
commit | 380b5dc0e59340e7ed36dcc95dd1022aca75bbe2 (patch) | |
tree | 78e298c775b637e7dc0029bc5ecfc28db9256038 /fs/xfs/linux-2.6 | |
parent | 80cce77980c645b1c129d0e90159c1b1bb78f6a6 (diff) |
[XFS] Fix up an internal sort function name collision issue.
SGI-PV: 942986
SGI-Modid: xfs-linux:xfs-kern:23859a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_linux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index 68c5d885ed9c..960a626dd1e3 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h | |||
@@ -254,11 +254,11 @@ static inline void set_buffer_unwritten_io(struct buffer_head *bh) | |||
254 | #define MAX(a,b) (max(a,b)) | 254 | #define MAX(a,b) (max(a,b)) |
255 | #define howmany(x, y) (((x)+((y)-1))/(y)) | 255 | #define howmany(x, y) (((x)+((y)-1))/(y)) |
256 | #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) | 256 | #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) |
257 | #define qsort(a,n,s,fn) sort(a,n,s,fn,NULL) | ||
258 | 257 | ||
259 | /* | 258 | /* |
260 | * Various platform dependent calls that don't fit anywhere else | 259 | * Various platform dependent calls that don't fit anywhere else |
261 | */ | 260 | */ |
261 | #define xfs_sort(a,n,s,fn) sort(a,n,s,fn,NULL) | ||
262 | #define xfs_stack_trace() dump_stack() | 262 | #define xfs_stack_trace() dump_stack() |
263 | #define xfs_itruncate_data(ip, off) \ | 263 | #define xfs_itruncate_data(ip, off) \ |
264 | (-vmtruncate(LINVFS_GET_IP(XFS_ITOV(ip)), (off))) | 264 | (-vmtruncate(LINVFS_GET_IP(XFS_ITOV(ip)), (off))) |