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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
xfs
/
xfs_dir2_leaf.c
diff --git
a/fs/xfs/xfs_dir2_leaf.c
b/fs/xfs/xfs_dir2_leaf.c
index
0f5e2f2
..
b1cf1fb
100644
(file)
--- a/
fs/xfs/xfs_dir2_leaf.c
+++ b/
fs/xfs/xfs_dir2_leaf.c
@@
-24,14
+24,12
@@
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
-#include "xfs_dir.h"
#include "xfs_dir2.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_da_btree.h"
#include "xfs_bmap_btree.h"
#include "xfs_attr_sf.h"
#include "xfs_dir2.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_da_btree.h"
#include "xfs_bmap_btree.h"
#include "xfs_attr_sf.h"
-#include "xfs_dir_sf.h"
#include "xfs_dir2_sf.h"
#include "xfs_dinode.h"
#include "xfs_inode.h"
#include "xfs_dir2_sf.h"
#include "xfs_dinode.h"
#include "xfs_inode.h"
@@
-407,7
+405,7
@@
xfs_dir2_leaf_addname(
* Initialize our new entry (at last).
*/
dep = (xfs_dir2_data_entry_t *)dup;
* Initialize our new entry (at last).
*/
dep = (xfs_dir2_data_entry_t *)dup;
-
INT_SET(dep->inumber, ARCH_CONVERT,
args->inumber);
+
dep->inumber = cpu_to_be64(
args->inumber);
dep->namelen = args->namelen;
memcpy(dep->name, args->name, dep->namelen);
tagp = XFS_DIR2_DATA_ENTRY_TAG_P(dep);
dep->namelen = args->namelen;
memcpy(dep->name, args->name, dep->namelen);
tagp = XFS_DIR2_DATA_ENTRY_TAG_P(dep);
@@
-884,7
+882,7
@@
xfs_dir2_leaf_getdents(
XFS_DIR2_BYTE_TO_DA(mp,
XFS_DIR2_LEAF_OFFSET) - map_off,
XFS_BMAPI_METADATA, NULL, 0,
XFS_DIR2_BYTE_TO_DA(mp,
XFS_DIR2_LEAF_OFFSET) - map_off,
XFS_BMAPI_METADATA, NULL, 0,
- &map[map_valid], &nmap, NULL);
+ &map[map_valid], &nmap, NULL
, NULL
);
/*
* Don't know if we should ignore this or
* try to return an error.
/*
* Don't know if we should ignore this or
* try to return an error.
@@
-1098,7
+1096,7
@@
xfs_dir2_leaf_getdents(
p->cook = XFS_DIR2_BYTE_TO_DATAPTR(mp, curoff + length);
p->cook = XFS_DIR2_BYTE_TO_DATAPTR(mp, curoff + length);
- p->ino =
INT_GET(dep->inumber, ARCH_CONVERT
);
+ p->ino =
be64_to_cpu(dep->inumber
);
#if XFS_BIG_INUMS
p->ino += mp->m_inoadd;
#endif
#if XFS_BIG_INUMS
p->ino += mp->m_inoadd;
#endif
@@
-1319,7
+1317,7
@@
xfs_dir2_leaf_lookup(
/*
* Return the found inode number.
*/
/*
* Return the found inode number.
*/
- args->inumber =
INT_GET(dep->inumber, ARCH_CONVERT
);
+ args->inumber =
be64_to_cpu(dep->inumber
);
xfs_da_brelse(tp, dbp);
xfs_da_brelse(tp, lbp);
return XFS_ERROR(EEXIST);
xfs_da_brelse(tp, dbp);
xfs_da_brelse(tp, lbp);
return XFS_ERROR(EEXIST);
@@
-1606,11
+1604,11
@@
xfs_dir2_leaf_replace(
dep = (xfs_dir2_data_entry_t *)
((char *)dbp->data +
XFS_DIR2_DATAPTR_TO_OFF(dp->i_mount, be32_to_cpu(lep->address)));
dep = (xfs_dir2_data_entry_t *)
((char *)dbp->data +
XFS_DIR2_DATAPTR_TO_OFF(dp->i_mount, be32_to_cpu(lep->address)));
- ASSERT(args->inumber !=
INT_GET(dep->inumber, ARCH_CONVERT
));
+ ASSERT(args->inumber !=
be64_to_cpu(dep->inumber
));
/*
* Put the new inode number in, log it.
*/
/*
* Put the new inode number in, log it.
*/
-
INT_SET(dep->inumber, ARCH_CONVERT,
args->inumber);
+
dep->inumber = cpu_to_be64(
args->inumber);
tp = args->trans;
xfs_dir2_data_log_entry(tp, dbp, dep);
xfs_da_buf_done(dbp);
tp = args->trans;
xfs_dir2_data_log_entry(tp, dbp, dep);
xfs_da_buf_done(dbp);