projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
[powerpc.git]
/
fs
/
ufs
/
util.c
diff --git
a/fs/ufs/util.c
b/fs/ufs/util.c
index
22f820a
..
410084d
100644
(file)
--- a/
fs/ufs/util.c
+++ b/
fs/ufs/util.c
@@
-11,6
+11,7
@@
#include <linux/ufs_fs.h>
#include <linux/buffer_head.h>
#include <linux/ufs_fs.h>
#include <linux/buffer_head.h>
+#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "swab.h"
#include "util.h"
@@
-184,14
+185,13
@@
void _ubh_memcpyubh_(struct ufs_sb_private_info * uspi,
dev_t
ufs_get_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi)
{
dev_t
ufs_get_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi)
{
- __
fs
32 fs32;
+ __
u
32 fs32;
dev_t dev;
if ((UFS_SB(sb)->s_flags & UFS_ST_MASK) == UFS_ST_SUNx86)
dev_t dev;
if ((UFS_SB(sb)->s_flags & UFS_ST_MASK) == UFS_ST_SUNx86)
- fs32 =
ufsi->i_u1.i_data[1]
;
+ fs32 =
fs32_to_cpu(sb, ufsi->i_u1.i_data[1])
;
else
else
- fs32 = ufsi->i_u1.i_data[0];
- fs32 = fs32_to_cpu(sb, fs32);
+ fs32 = fs32_to_cpu(sb, ufsi->i_u1.i_data[0]);
switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
case UFS_ST_SUNx86:
case UFS_ST_SUN:
switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
case UFS_ST_SUNx86:
case UFS_ST_SUN:
@@
-212,7
+212,7
@@
ufs_get_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi)
void
ufs_set_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi, dev_t dev)
{
void
ufs_set_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi, dev_t dev)
{
- __
fs
32 fs32;
+ __
u
32 fs32;
switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
case UFS_ST_SUNx86:
switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
case UFS_ST_SUNx86:
@@
-227,11
+227,10
@@
ufs_set_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi, dev_t dev
fs32 = old_encode_dev(dev);
break;
}
fs32 = old_encode_dev(dev);
break;
}
- fs32 = cpu_to_fs32(sb, fs32);
if ((UFS_SB(sb)->s_flags & UFS_ST_MASK) == UFS_ST_SUNx86)
if ((UFS_SB(sb)->s_flags & UFS_ST_MASK) == UFS_ST_SUNx86)
- ufsi->i_u1.i_data[1] =
fs32
;
+ ufsi->i_u1.i_data[1] =
cpu_to_fs32(sb, fs32)
;
else
else
- ufsi->i_u1.i_data[0] =
fs32
;
+ ufsi->i_u1.i_data[0] =
cpu_to_fs32(sb, fs32)
;
}
/**
}
/**
@@
-253,13
+252,11
@@
struct page *ufs_get_locked_page(struct address_space *mapping,
page = find_lock_page(mapping, index);
if (!page) {
page = find_lock_page(mapping, index);
if (!page) {
- page = read_cache_page(mapping, index,
- (filler_t*)mapping->a_ops->readpage,
- NULL);
+ page = read_mapping_page(mapping, index, NULL);
if (IS_ERR(page)) {
printk(KERN_ERR "ufs_change_blocknr: "
if (IS_ERR(page)) {
printk(KERN_ERR "ufs_change_blocknr: "
- "read_
cache
_page error: ino %lu, index: %lu\n",
+ "read_
mapping
_page error: ino %lu, index: %lu\n",
mapping->host->i_ino, index);
goto out;
}
mapping->host->i_ino, index);
goto out;
}