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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
xfs
/
xfs_trans_ail.c
diff --git
a/fs/xfs/xfs_trans_ail.c
b/fs/xfs/xfs_trans_ail.c
index
19ab24a
..
fc39b16
100644
(file)
--- a/
fs/xfs/xfs_trans_ail.c
+++ b/
fs/xfs/xfs_trans_ail.c
@@
-22,7
+22,6
@@
#include "xfs_inum.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_inum.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
-#include "xfs_dir.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_trans_priv.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_trans_priv.h"
@@
-277,7
+276,7
@@
xfs_trans_update_ail(
xfs_mount_t *mp,
xfs_log_item_t *lip,
xfs_lsn_t lsn,
xfs_mount_t *mp,
xfs_log_item_t *lip,
xfs_lsn_t lsn,
- unsigned long s)
+ unsigned long s)
__releases(mp->m_ail_lock)
{
xfs_ail_entry_t *ailp;
xfs_log_item_t *dlip=NULL;
{
xfs_ail_entry_t *ailp;
xfs_log_item_t *dlip=NULL;
@@
-329,7
+328,7
@@
void
xfs_trans_delete_ail(
xfs_mount_t *mp,
xfs_log_item_t *lip,
xfs_trans_delete_ail(
xfs_mount_t *mp,
xfs_log_item_t *lip,
- unsigned long s)
+ unsigned long s)
__releases(mp->m_ail_lock)
{
xfs_ail_entry_t *ailp;
xfs_log_item_t *dlip;
{
xfs_ail_entry_t *ailp;
xfs_log_item_t *dlip;
@@
-363,9
+362,10
@@
xfs_trans_delete_ail(
AIL_UNLOCK(mp, s);
else {
xfs_cmn_err(XFS_PTAG_AILDELETE, CE_ALERT, mp,
AIL_UNLOCK(mp, s);
else {
xfs_cmn_err(XFS_PTAG_AILDELETE, CE_ALERT, mp,
- "xfs_trans_delete_ail: attempting to delete a log item that is not in the AIL");
+ "%s: attempting to delete a log item that is not in the AIL",
+ __FUNCTION__);
AIL_UNLOCK(mp, s);
AIL_UNLOCK(mp, s);
- xfs_force_shutdown(mp,
XFS
_CORRUPT_INCORE);
+ xfs_force_shutdown(mp,
SHUTDOWN
_CORRUPT_INCORE);
}
}
}
}
}
}