Deleted Added
sdiff udiff text old ( 109462 ) new ( 116084 )
full compact
inode.c (109462) inode.c (116084)
1/*
2 * Copyright (c) 2002 Juli Mallett. All rights reserved.
3 *
4 * This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
5 * FreeBSD project. Redistribution and use in source and binary forms, with
6 * or without modification, are permitted provided that the following
7 * conditions are met:
8 *

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

21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
23 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
24 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25 * POSSIBILITY OF SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*
2 * Copyright (c) 2002 Juli Mallett. All rights reserved.
3 *
4 * This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
5 * FreeBSD project. Redistribution and use in source and binary forms, with
6 * or without modification, are permitted provided that the following
7 * conditions are met:
8 *

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

21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
23 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
24 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25 * POSSIBILITY OF SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/lib/libufs/inode.c 109462 2003-01-18 04:22:14Z jmallett $");
29__FBSDID("$FreeBSD: head/lib/libufs/inode.c 116084 2003-06-09 09:32:29Z jmallett $");
30
31#include <sys/param.h>
32#include <sys/mount.h>
33#include <sys/disklabel.h>
34#include <sys/stat.h>
35
36#include <ufs/ufs/ufsmount.h>
37#include <ufs/ufs/dinode.h>

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

61 inoblock = disk->d_inoblock;
62 min = disk->d_inomin;
63 max = disk->d_inomax;
64
65 if (inoblock == NULL) {
66 inoblock = malloc(fs->fs_bsize);
67 if (inoblock == NULL) {
68 ERROR(disk, "unable to allocate inode block");
30
31#include <sys/param.h>
32#include <sys/mount.h>
33#include <sys/disklabel.h>
34#include <sys/stat.h>
35
36#include <ufs/ufs/ufsmount.h>
37#include <ufs/ufs/dinode.h>

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

61 inoblock = disk->d_inoblock;
62 min = disk->d_inomin;
63 max = disk->d_inomax;
64
65 if (inoblock == NULL) {
66 inoblock = malloc(fs->fs_bsize);
67 if (inoblock == NULL) {
68 ERROR(disk, "unable to allocate inode block");
69 return -1;
69 return (-1);
70 }
71 disk->d_inoblock = inoblock;
72 }
73 if (inode >= min && inode < max)
74 goto gotit;
75 bread(disk, fsbtodb(fs, ino_to_fsba(fs, inode)), inoblock,
76 fs->fs_bsize);
77 disk->d_inomin = min = inode - (inode & INOPB(fs));
78 disk->d_inomax = max = min + INOPB(fs);
79gotit: switch (disk->d_ufs) {
80 case 1:
81 dp1 = &((struct ufs1_dinode *)inoblock)[inode - min];
82 *mode = dp1->di_mode & IFMT;
83 *dino = dp1;
70 }
71 disk->d_inoblock = inoblock;
72 }
73 if (inode >= min && inode < max)
74 goto gotit;
75 bread(disk, fsbtodb(fs, ino_to_fsba(fs, inode)), inoblock,
76 fs->fs_bsize);
77 disk->d_inomin = min = inode - (inode & INOPB(fs));
78 disk->d_inomax = max = min + INOPB(fs);
79gotit: switch (disk->d_ufs) {
80 case 1:
81 dp1 = &((struct ufs1_dinode *)inoblock)[inode - min];
82 *mode = dp1->di_mode & IFMT;
83 *dino = dp1;
84 return 0;
84 return (0);
85 case 2:
86 dp2 = &((struct ufs2_dinode *)inoblock)[inode - min];
87 *mode = dp2->di_mode & IFMT;
88 *dino = dp2;
85 case 2:
86 dp2 = &((struct ufs2_dinode *)inoblock)[inode - min];
87 *mode = dp2->di_mode & IFMT;
88 *dino = dp2;
89 return 0;
89 return (0);
90 default:
91 break;
92 }
93 ERROR(disk, "unknown UFS filesystem type");
90 default:
91 break;
92 }
93 ERROR(disk, "unknown UFS filesystem type");
94 return -1;
94 return (-1);
95}
95}