Deleted Added
full compact
ext2_subr.c (217594) ext2_subr.c (228539)
1/*-
2 * modified for Lites 1.1
3 *
4 * Aug 1995, Godmar Back (gback@cs.utah.edu)
5 * University of Utah, Department of Computer Science
6 */
7/*-
8 * Copyright (c) 1982, 1986, 1989, 1993

--- 19 unchanged lines hidden (view full) ---

28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93
1/*-
2 * modified for Lites 1.1
3 *
4 * Aug 1995, Godmar Back (gback@cs.utah.edu)
5 * University of Utah, Department of Computer Science
6 */
7/*-
8 * Copyright (c) 1982, 1986, 1989, 1993

--- 19 unchanged lines hidden (view full) ---

28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93
36 * $FreeBSD: head/sys/fs/ext2fs/ext2_subr.c 217594 2011-01-19 19:49:48Z jhb $
36 * $FreeBSD: head/sys/fs/ext2fs/ext2_subr.c 228539 2011-12-15 20:31:18Z pfg $
37 */
38
39#include <sys/param.h>
40
41#include <sys/proc.h>
42#include <sys/systm.h>
43#include <sys/bio.h>
44#include <sys/buf.h>

--- 70 unchanged lines hidden (view full) ---

115 vprint("Disk overlap", vp);
116 (void)printf("\tstart %d, end %d overlap start %lld, end %ld\n",
117 start, last, (long long)ep->b_blkno,
118 (long)(ep->b_blkno + btodb(ep->b_bcount) - 1));
119 panic("Disk buffer overlap");
120 }
121}
122#endif /* KDB */
37 */
38
39#include <sys/param.h>
40
41#include <sys/proc.h>
42#include <sys/systm.h>
43#include <sys/bio.h>
44#include <sys/buf.h>

--- 70 unchanged lines hidden (view full) ---

115 vprint("Disk overlap", vp);
116 (void)printf("\tstart %d, end %d overlap start %lld, end %ld\n",
117 start, last, (long long)ep->b_blkno,
118 (long)(ep->b_blkno + btodb(ep->b_bcount) - 1));
119 panic("Disk buffer overlap");
120 }
121}
122#endif /* KDB */
123
124/*
125 * Update the cluster map because of an allocation of free like ffs.
126 *
127 * Cnt == 1 means free; cnt == -1 means allocating.
128 */
129void
130ext2_clusteracct(struct m_ext2fs *fs, char *bbp, int cg, daddr_t bno, int cnt)
131{
132 int32_t *sump = fs->e2fs_clustersum[cg].cs_sum;
133 int32_t *lp;
134 int back, bit, end, forw, i, loc, start;
135
136 /* Initialize the cluster summary array. */
137 if (fs->e2fs_clustersum[cg].cs_init == 0) {
138 int run = 0;
139 bit = 1;
140 loc = 0;
141
142 for (i = 0; i < fs->e2fs->e2fs_fpg; i++) {
143 if ((bbp[loc] & bit) == 0)
144 run++;
145 else if (run != 0) {
146 if (run > fs->e2fs_contigsumsize)
147 run = fs->e2fs_contigsumsize;
148 sump[run]++;
149 run = 0;
150 }
151 if ((i & (NBBY - 1)) != (NBBY - 1))
152 bit <<= 1;
153 else {
154 loc++;
155 bit = 1;
156 }
157 }
158 if (run != 0) {
159 if (run > fs->e2fs_contigsumsize)
160 run = fs->e2fs_contigsumsize;
161 sump[run]++;
162 }
163 fs->e2fs_clustersum[cg].cs_init = 1;
164 }
165
166 if (fs->e2fs_contigsumsize <= 0)
167 return;
168
169 /* Find the size of the cluster going forward. */
170 start = bno + 1;
171 end = start + fs->e2fs_contigsumsize;
172 if (end > fs->e2fs->e2fs_fpg)
173 end = fs->e2fs->e2fs_fpg;
174 loc = start / NBBY;
175 bit = 1 << (start % NBBY);
176 for (i = start; i < end; i++) {
177 if ((bbp[loc] & bit) != 0)
178 break;
179 if ((i & (NBBY - 1)) != (NBBY - 1))
180 bit <<= 1;
181 else {
182 loc++;
183 bit = 1;
184 }
185 }
186 forw = i - start;
187
188 /* Find the size of the cluster going backward. */
189 start = bno - 1;
190 end = start - fs->e2fs_contigsumsize;
191 if (end < 0)
192 end = -1;
193 loc = start / NBBY;
194 bit = 1 << (start % NBBY);
195 for (i = start; i > end; i--) {
196 if ((bbp[loc] & bit) != 0)
197 break;
198 if ((i & (NBBY - 1)) != 0)
199 bit >>= 1;
200 else {
201 loc--;
202 bit = 1 << (NBBY - 1);
203 }
204 }
205 back = start - i;
206
207 /*
208 * Account for old cluster and the possibly new forward and
209 * back clusters.
210 */
211 i = back + forw + 1;
212 if (i > fs->e2fs_contigsumsize)
213 i = fs->e2fs_contigsumsize;
214 sump[i] += cnt;
215 if (back > 0)
216 sump[back] -= cnt;
217 if (forw > 0)
218 sump[forw] -= cnt;
219
220 /* Update cluster summary information. */
221 lp = &sump[fs->e2fs_contigsumsize];
222 for (i = fs->e2fs_contigsumsize; i > 0; i--)
223 if (*lp-- > 0)
224 break;
225 fs->e2fs_maxcluster[cg] = i;
226}