Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29666
b: refs/heads/master
c: 552c034
h: refs/heads/master
v: v3
  • Loading branch information
Cliff Wickman authored and Linus Torvalds committed Jun 25, 2006
1 parent 6941bc7 commit 4dd9d7a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bbb1747d4e44ce49acc73daa8d66e5f6bd546f1b
refs/heads/master: 552c03483e49a69312c9e7384fda9282c991880a
4 changes: 2 additions & 2 deletions trunk/fs/freevxfs/vxfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,11 @@ struct vxfs_sb {
* In core superblock filesystem private data for VxFS.
*/
struct vxfs_sb_info {
struct vxfs_sb *vsi_raw; /* raw (on disk) supeblock */
struct vxfs_sb *vsi_raw; /* raw (on disk) superblock */
struct buffer_head *vsi_bp; /* buffer for raw superblock*/
struct inode *vsi_fship; /* fileset header inode */
struct inode *vsi_ilist; /* inode list inode */
struct inode *vsi_stilist; /* structual inode list inode */
struct inode *vsi_stilist; /* structural inode list inode */
u_long vsi_iext; /* initial inode list */
ino_t vsi_fshino; /* fileset header inode */
daddr_t vsi_oltext; /* OLT extent */
Expand Down
12 changes: 6 additions & 6 deletions trunk/fs/freevxfs/vxfs_fshead.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ vxfs_read_fshead(struct super_block *sbp)

vip = vxfs_blkiget(sbp, infp->vsi_iext, infp->vsi_fshino);
if (!vip) {
printk(KERN_ERR "vxfs: unabled to read fsh inode\n");
printk(KERN_ERR "vxfs: unable to read fsh inode\n");
return -EINVAL;
}
if (!VXFS_ISFSH(vip)) {
Expand All @@ -129,13 +129,13 @@ vxfs_read_fshead(struct super_block *sbp)

infp->vsi_fship = vxfs_get_fake_inode(sbp, vip);
if (!infp->vsi_fship) {
printk(KERN_ERR "vxfs: unabled to get fsh inode\n");
printk(KERN_ERR "vxfs: unable to get fsh inode\n");
goto out_free_fship;
}

sfp = vxfs_getfsh(infp->vsi_fship, 0);
if (!sfp) {
printk(KERN_ERR "vxfs: unabled to get structural fsh\n");
printk(KERN_ERR "vxfs: unable to get structural fsh\n");
goto out_iput_fship;
}

Expand All @@ -145,7 +145,7 @@ vxfs_read_fshead(struct super_block *sbp)

pfp = vxfs_getfsh(infp->vsi_fship, 1);
if (!pfp) {
printk(KERN_ERR "vxfs: unabled to get primary fsh\n");
printk(KERN_ERR "vxfs: unable to get primary fsh\n");
goto out_free_sfp;
}

Expand All @@ -159,7 +159,7 @@ vxfs_read_fshead(struct super_block *sbp)

infp->vsi_stilist = vxfs_get_fake_inode(sbp, tip);
if (!infp->vsi_stilist) {
printk(KERN_ERR "vxfs: unabled to get structual list inode\n");
printk(KERN_ERR "vxfs: unable to get structural list inode\n");
kfree(tip);
goto out_free_pfp;
}
Expand All @@ -174,7 +174,7 @@ vxfs_read_fshead(struct super_block *sbp)
goto out_iput_stilist;
infp->vsi_ilist = vxfs_get_fake_inode(sbp, tip);
if (!infp->vsi_ilist) {
printk(KERN_ERR "vxfs: unabled to get inode list inode\n");
printk(KERN_ERR "vxfs: unable to get inode list inode\n");
kfree(tip);
goto out_iput_stilist;
}
Expand Down

0 comments on commit 4dd9d7a

Please sign in to comment.