Deleted Added
full compact
ffs_snapshot.c (170307) ffs_snapshot.c (173464)
1/*-
2 * Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
3 *
4 * Further information about snapshots can be obtained from:
5 *
6 * Marshall Kirk McKusick http://www.mckusick.com/softdep/
7 * 1614 Oxford Street mckusick@mckusick.com
8 * Berkeley, CA 94709-1608 +1-510-843-9542

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

29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)ffs_snapshot.c 8.11 (McKusick) 7/23/00
34 */
35
36#include <sys/cdefs.h>
1/*-
2 * Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
3 *
4 * Further information about snapshots can be obtained from:
5 *
6 * Marshall Kirk McKusick http://www.mckusick.com/softdep/
7 * 1614 Oxford Street mckusick@mckusick.com
8 * Berkeley, CA 94709-1608 +1-510-843-9542

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

29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)ffs_snapshot.c 8.11 (McKusick) 7/23/00
34 */
35
36#include <sys/cdefs.h>
37__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_snapshot.c 170307 2007-06-05 00:00:57Z jeff $");
37__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_snapshot.c 173464 2007-11-08 17:21:51Z obrien $");
38
39#include "opt_quota.h"
40
41#include <sys/param.h>
42#include <sys/kernel.h>
43#include <sys/systm.h>
44#include <sys/conf.h>
45#include <sys/bio.h>

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

2295 break;
2296 indiroff = (lbn - NDADDR) % NINDIR(fs);
2297 if (ip->i_ump->um_fstype == UFS1)
2298 blkno=((ufs1_daddr_t *)(ibp->b_data))[indiroff];
2299 else
2300 blkno=((ufs2_daddr_t *)(ibp->b_data))[indiroff];
2301 bqrelse(ibp);
2302 }
38
39#include "opt_quota.h"
40
41#include <sys/param.h>
42#include <sys/kernel.h>
43#include <sys/systm.h>
44#include <sys/conf.h>
45#include <sys/bio.h>

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

2295 break;
2296 indiroff = (lbn - NDADDR) % NINDIR(fs);
2297 if (ip->i_ump->um_fstype == UFS1)
2298 blkno=((ufs1_daddr_t *)(ibp->b_data))[indiroff];
2299 else
2300 blkno=((ufs2_daddr_t *)(ibp->b_data))[indiroff];
2301 bqrelse(ibp);
2302 }
2303#ifdef DIAGNOSTIC
2303#ifdef INVARIANTS
2304 if (blkno == BLK_SNAP && bp->b_lblkno >= 0)
2305 panic("ffs_copyonwrite: bad copy block");
2306#endif
2307 if (blkno != 0)
2308 continue;
2309 /*
2310 * Allocate the block into which to do the copy. Since
2311 * multiple processes may all try to copy the same block,

--- 216 unchanged lines hidden ---
2304 if (blkno == BLK_SNAP && bp->b_lblkno >= 0)
2305 panic("ffs_copyonwrite: bad copy block");
2306#endif
2307 if (blkno != 0)
2308 continue;
2309 /*
2310 * Allocate the block into which to do the copy. Since
2311 * multiple processes may all try to copy the same block,

--- 216 unchanged lines hidden ---