git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
fs
/
xfs
/
xfs_trans.c
diff --git
a/fs/xfs/xfs_trans.c
b/fs/xfs/xfs_trans.c
index
2918956
..
8d056ce
100644
(file)
--- a/
fs/xfs/xfs_trans.c
+++ b/
fs/xfs/xfs_trans.c
@@
-490,7
+490,7
@@
xfs_trans_mod_sb(
case XFS_TRANS_SB_RES_FREXTENTS:
/*
* The allocation has already been applied to the
case XFS_TRANS_SB_RES_FREXTENTS:
/*
* The allocation has already been applied to the
- * in-core superblock
s
's counter. This should only
+ * in-core superblock's counter. This should only
* be applied to the on-disk superblock.
*/
ASSERT(delta < 0);
* be applied to the on-disk superblock.
*/
ASSERT(delta < 0);
@@
-611,7
+611,7
@@
xfs_trans_apply_sb_deltas(
if (whole)
/*
if (whole)
/*
- * Log the whole thing, the fields are
dis
contiguous.
+ * Log the whole thing, the fields are
non
contiguous.
*/
xfs_trans_log_buf(tp, bp, 0, sizeof(xfs_sb_t) - 1);
else
*/
xfs_trans_log_buf(tp, bp, 0, sizeof(xfs_sb_t) - 1);
else
@@
-669,7
+669,7
@@
xfs_trans_unreserve_and_mod_sb(
/*
* Apply any superblock modifications to the in-core version.
* The t_res_fdblocks_delta and t_res_frextents_delta fields are
/*
* Apply any superblock modifications to the in-core version.
* The t_res_fdblocks_delta and t_res_frextents_delta fields are
- * explicity NOT applied to the in-core superblock.
+ * explicit
l
y NOT applied to the in-core superblock.
* The idea is that that has already been done.
*/
if (tp->t_flags & XFS_TRANS_SB_DIRTY) {
* The idea is that that has already been done.
*/
if (tp->t_flags & XFS_TRANS_SB_DIRTY) {