projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[deliverable/linux.git]
/
fs
/
jfs
/
jfs_dmap.c
diff --git
a/fs/jfs/jfs_dmap.c
b/fs/jfs/jfs_dmap.c
index e1985066b1c63273cf5bf568ea6f9a417abb0a7a..2bc7d8aa5740d6963a1d7055259248ab5ba86ebf 100644
(file)
--- a/
fs/jfs/jfs_dmap.c
+++ b/
fs/jfs/jfs_dmap.c
@@
-2172,7
+2172,7
@@
static void dbAllocBits(struct bmap * bmp, struct dmap * dp, s64 blkno,
}
/* update the free count for this dmap */
}
/* update the free count for this dmap */
-
dp->nfree = cpu_to_le32(le32_to_cpu(dp->nfree) -
nblocks);
+
le32_add_cpu(&dp->nfree, -
nblocks);
BMAP_LOCK(bmp);
BMAP_LOCK(bmp);
@@
-2316,7
+2316,7
@@
static int dbFreeBits(struct bmap * bmp, struct dmap * dp, s64 blkno,
/* update the free count for this dmap.
*/
/* update the free count for this dmap.
*/
-
dp->nfree = cpu_to_le32(le32_to_cpu(dp->nfree) +
nblocks);
+
le32_add_cpu(&dp->nfree,
nblocks);
BMAP_LOCK(bmp);
BMAP_LOCK(bmp);
@@
-3226,7
+3226,7
@@
static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno,
}
/* update the free count for this dmap */
}
/* update the free count for this dmap */
-
dp->nfree = cpu_to_le32(le32_to_cpu(dp->nfree) -
nblocks);
+
le32_add_cpu(&dp->nfree, -
nblocks);
/* reconstruct summary tree */
dbInitDmapTree(dp);
/* reconstruct summary tree */
dbInitDmapTree(dp);
@@
-3660,9
+3660,8
@@
static int dbInitDmap(struct dmap * dp, s64 Blkno, int nblocks)
goto initTree;
}
} else {
goto initTree;
}
} else {
- dp->nblocks =
- cpu_to_le32(le32_to_cpu(dp->nblocks) + nblocks);
- dp->nfree = cpu_to_le32(le32_to_cpu(dp->nfree) + nblocks);
+ le32_add_cpu(&dp->nblocks, nblocks);
+ le32_add_cpu(&dp->nfree, nblocks);
}
/* word number containing start block number */
}
/* word number containing start block number */
This page took
0.025169 seconds
and
5
git commands to generate.