aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fs/xfs/linux-2.6/xfs_buf.c8
-rw-r--r--fs/xfs/support/qsort.c154
-rw-r--r--fs/xfs/support/qsort.h24
3 files changed, 4 insertions, 182 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index a764ded9f3a0..6fe21d2b8847 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1685,8 +1685,8 @@ STATIC int xfsbufd_force_sleep;
1685 1685
1686STATIC int 1686STATIC int
1687xfsbufd_wakeup( 1687xfsbufd_wakeup(
1688 int priority, 1688 int priority,
1689 gfp_t mask) 1689 gfp_t mask)
1690{ 1690{
1691 if (xfsbufd_force_sleep) 1691 if (xfsbufd_force_sleep)
1692 return 0; 1692 return 0;
@@ -1716,8 +1716,8 @@ xfsbufd(
1716 xfsbufd_force_sleep = 0; 1716 xfsbufd_force_sleep = 0;
1717 } 1717 }
1718 1718
1719 schedule_timeout_interruptible 1719 schedule_timeout_interruptible(
1720 (xfs_buf_timer_centisecs * msecs_to_jiffies(10)); 1720 xfs_buf_timer_centisecs * msecs_to_jiffies(10));
1721 1721
1722 age = xfs_buf_age_centisecs * msecs_to_jiffies(10); 1722 age = xfs_buf_age_centisecs * msecs_to_jiffies(10);
1723 spin_lock(&pbd_delwrite_lock); 1723 spin_lock(&pbd_delwrite_lock);
diff --git a/fs/xfs/support/qsort.c b/fs/xfs/support/qsort.c
deleted file mode 100644
index 2cb05c7569db..000000000000
--- a/fs/xfs/support/qsort.c
+++ /dev/null
@@ -1,154 +0,0 @@
1/*
2 * Copyright (c) 1992, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of the University nor the names of its contributors
14 * may be used to endorse or promote products derived from this software
15 * without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29#include <linux/kernel.h>
30#include <linux/string.h>
31
32/*
33 * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
34 */
35#define swapcode(TYPE, parmi, parmj, n) { \
36 long i = (n) / sizeof (TYPE); \
37 register TYPE *pi = (TYPE *) (parmi); \
38 register TYPE *pj = (TYPE *) (parmj); \
39 do { \
40 register TYPE t = *pi; \
41 *pi++ = *pj; \
42 *pj++ = t; \
43 } while (--i > 0); \
44}
45
46#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
47 es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
48
49static __inline void
50swapfunc(char *a, char *b, int n, int swaptype)
51{
52 if (swaptype <= 1)
53 swapcode(long, a, b, n)
54 else
55 swapcode(char, a, b, n)
56}
57
58#define swap(a, b) \
59 if (swaptype == 0) { \
60 long t = *(long *)(a); \
61 *(long *)(a) = *(long *)(b); \
62 *(long *)(b) = t; \
63 } else \
64 swapfunc(a, b, es, swaptype)
65
66#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype)
67
68static __inline char *
69med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
70{
71 return cmp(a, b) < 0 ?
72 (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
73 :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
74}
75
76void
77qsort(void *aa, size_t n, size_t es, int (*cmp)(const void *, const void *))
78{
79 char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
80 int d, r, swaptype, swap_cnt;
81 register char *a = aa;
82
83loop: SWAPINIT(a, es);
84 swap_cnt = 0;
85 if (n < 7) {
86 for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
87 for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
88 pl -= es)
89 swap(pl, pl - es);
90 return;
91 }
92 pm = (char *)a + (n / 2) * es;
93 if (n > 7) {
94 pl = (char *)a;
95 pn = (char *)a + (n - 1) * es;
96 if (n > 40) {
97 d = (n / 8) * es;
98 pl = med3(pl, pl + d, pl + 2 * d, cmp);
99 pm = med3(pm - d, pm, pm + d, cmp);
100 pn = med3(pn - 2 * d, pn - d, pn, cmp);
101 }
102 pm = med3(pl, pm, pn, cmp);
103 }
104 swap(a, pm);
105 pa = pb = (char *)a + es;
106
107 pc = pd = (char *)a + (n - 1) * es;
108 for (;;) {
109 while (pb <= pc && (r = cmp(pb, a)) <= 0) {
110 if (r == 0) {
111 swap_cnt = 1;
112 swap(pa, pb);
113 pa += es;
114 }
115 pb += es;
116 }
117 while (pb <= pc && (r = cmp(pc, a)) >= 0) {
118 if (r == 0) {
119 swap_cnt = 1;
120 swap(pc, pd);
121 pd -= es;
122 }
123 pc -= es;
124 }
125 if (pb > pc)
126 break;
127 swap(pb, pc);
128 swap_cnt = 1;
129 pb += es;
130 pc -= es;
131 }
132 if (swap_cnt == 0) { /* Switch to insertion sort */
133 for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
134 for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
135 pl -= es)
136 swap(pl, pl - es);
137 return;
138 }
139
140 pn = (char *)a + n * es;
141 r = min(pa - (char *)a, pb - pa);
142 vecswap(a, pb - r, r);
143 r = min((long)(pd - pc), (long)(pn - pd - es));
144 vecswap(pb, pn - r, r);
145 if ((r = pb - pa) > es)
146 qsort(a, r / es, es, cmp);
147 if ((r = pd - pc) > es) {
148 /* Iterate rather than recurse to save stack space */
149 a = pn - r;
150 n = r / es;
151 goto loop;
152 }
153/* qsort(pn - r, r / es, es, cmp);*/
154}
diff --git a/fs/xfs/support/qsort.h b/fs/xfs/support/qsort.h
deleted file mode 100644
index bce5a78da9a0..000000000000
--- a/fs/xfs/support/qsort.h
+++ /dev/null
@@ -1,24 +0,0 @@
1/*
2 * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
3 * All Rights Reserved.
4 *
5 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License as
7 * published by the Free Software Foundation.
8 *
9 * This program is distributed in the hope that it would be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program; if not, write the Free Software Foundation,
16 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17 */
18#ifndef __XFS_SUPPORT_QSORT_H__
19#define __XFS_SUPPORT_QSORT_H__
20
21extern void qsort(void *const pbase, size_t total_elems, size_t size,
22 int (*cmp)(const void *, const void *));
23
24#endif /* __XFS_SUPPORT_QSORT_H__ */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-04 19:39:35 -0500