git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
fs
/
ext2
/
ialloc.c
diff --git
a/fs/ext2/ialloc.c
b/fs/ext2/ialloc.c
index
1b1dce4
..
3d9fa57
100644
(file)
--- a/
fs/ext2/ialloc.c
+++ b/
fs/ext2/ialloc.c
@@
-60,8
+60,8
@@
read_inode_bitmap(struct super_block * sb, unsigned long block_group)
if (!bh)
ext2_error(sb, "read_inode_bitmap",
"Cannot read inode bitmap - "
if (!bh)
ext2_error(sb, "read_inode_bitmap",
"Cannot read inode bitmap - "
- "block_group = %lu, inode_bitmap = %
l
u",
- block_group,
(unsigned long) desc->bg_inode_bitmap
);
+ "block_group = %lu, inode_bitmap = %u",
+ block_group,
le32_to_cpu(desc->bg_inode_bitmap)
);
error_out:
return bh;
}
error_out:
return bh;
}
@@
-469,7
+469,7
@@
struct inode *ext2_new_inode(struct inode *dir, int mode)
if (!inode)
return ERR_PTR(-ENOMEM);
if (!inode)
return ERR_PTR(-ENOMEM);
-
if (sb->s_flags & MS_TAGXID)
+ if (sb->s_flags & MS_TAGXID)
inode->i_xid = current->xid;
else
inode->i_xid = 0;
inode->i_xid = current->xid;
else
inode->i_xid = 0;
@@
-634,14
+634,14
@@
got:
return inode;
fail2:
return inode;
fail2:
- DLIMIT_FREE_INODE(sb, inode->i_xid);
+ DLIMIT_FREE_INODE(sb, inode->i_xid);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
return ERR_PTR(err);
fail:
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
return ERR_PTR(err);
fail:
- DLIMIT_FREE_INODE(sb, inode->i_xid);
+ DLIMIT_FREE_INODE(sb, inode->i_xid);
fail_dlim:
make_bad_inode(inode);
iput(inode);
fail_dlim:
make_bad_inode(inode);
iput(inode);