git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[safe/jmp/linux-2.6]
/
fs
/
xfs
/
xfs_trans_item.c
diff --git
a/fs/xfs/xfs_trans_item.c
b/fs/xfs/xfs_trans_item.c
index
486147e
..
2912aac
100644
(file)
--- a/
fs/xfs/xfs_trans_item.c
+++ b/
fs/xfs/xfs_trans_item.c
@@
-78,7
+78,7
@@
xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip)
lidp->lid_size = 0;
lip->li_desc = lidp;
lip->li_mountp = tp->t_mountp;
lidp->lid_size = 0;
lip->li_desc = lidp;
lip->li_mountp = tp->t_mountp;
- return
(lidp)
;
+ return
lidp
;
}
/*
}
/*
@@
-119,7
+119,7
@@
xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip)
lidp->lid_size = 0;
lip->li_desc = lidp;
lip->li_mountp = tp->t_mountp;
lidp->lid_size = 0;
lip->li_desc = lidp;
lip->li_mountp = tp->t_mountp;
- return
(lidp)
;
+ return
lidp
;
}
/*
}
/*
@@
-180,7
+180,7
@@
xfs_trans_find_item(xfs_trans_t *tp, xfs_log_item_t *lip)
{
ASSERT(lip->li_desc != NULL);
{
ASSERT(lip->li_desc != NULL);
- return
(lip->li_desc)
;
+ return
lip->li_desc
;
}
}
@@
-219,10
+219,10
@@
xfs_trans_first_item(xfs_trans_t *tp)
continue;
}
continue;
}
- return
(XFS_LIC_SLOT(licp, i)
);
+ return
XFS_LIC_SLOT(licp, i
);
}
cmn_err(CE_WARN, "xfs_trans_first_item() -- no first item");
}
cmn_err(CE_WARN, "xfs_trans_first_item() -- no first item");
- return
(NULL)
;
+ return
NULL
;
}
}
@@
-252,7
+252,7
@@
xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
continue;
}
continue;
}
- return
(XFS_LIC_SLOT(licp, i)
);
+ return
XFS_LIC_SLOT(licp, i
);
}
/*
}
/*
@@
-261,7
+261,7
@@
xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
* If there is no next chunk, return NULL.
*/
if (licp->lic_next == NULL) {
* If there is no next chunk, return NULL.
*/
if (licp->lic_next == NULL) {
- return
(NULL)
;
+ return
NULL
;
}
licp = licp->lic_next;
}
licp = licp->lic_next;
@@
-271,7
+271,7
@@
xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
continue;
}
continue;
}
- return
(XFS_LIC_SLOT(licp, i)
);
+ return
XFS_LIC_SLOT(licp, i
);
}
ASSERT(0);
/* NOTREACHED */
}
ASSERT(0);
/* NOTREACHED */
@@
-425,7
+425,7
@@
xfs_trans_unlock_chunk(
}
}
}
}
- return
(freed)
;
+ return
freed
;
}
}
@@
-478,7
+478,7
@@
xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
*/
lbsp->lbc_ag = ag;
lbsp->lbc_idx = idx;
*/
lbsp->lbc_ag = ag;
lbsp->lbc_idx = idx;
- return
(lbsp)
;
+ return
lbsp
;
}
/*
}
/*
@@
-493,7
+493,7
@@
xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
break;
} else {
/* out-of-order vacancy */
break;
} else {
/* out-of-order vacancy */
-
printk(
"OOO vacancy lbcp 0x%p\n", lbcp);
+
cmn_err(CE_DEBUG,
"OOO vacancy lbcp 0x%p\n", lbcp);
ASSERT(0);
}
}
ASSERT(0);
}
}
@@
-512,7
+512,7
@@
xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
tp->t_busy_free--;
lbsp->lbc_ag = ag;
lbsp->lbc_idx = idx;
tp->t_busy_free--;
lbsp->lbc_ag = ag;
lbsp->lbc_idx = idx;
- return
(lbsp)
;
+ return
lbsp
;
}
}