diff options
| author | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 04:39:16 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 04:39:16 -0500 |
| commit | 0afa1b62e33250d4777c5803a98ae69fbe872061 (patch) | |
| tree | 1c747bc01b62bca85d277e2c8321ae6cf0006ed8 /fs/xfs/xfs_trans.c | |
| parent | 97387e3baaf3c35ad560f8878e943c720a77da1b (diff) | |
| parent | bb4c7e9a9908548b458f34afb2fee74dc0d49f90 (diff) | |
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'fs/xfs/xfs_trans.c')
| -rw-r--r-- | fs/xfs/xfs_trans.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 329b06aba1c2..7adcdf15ae0c 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c | |||
| @@ -1151,8 +1151,8 @@ xfs_trans_add_item( | |||
| 1151 | { | 1151 | { |
| 1152 | struct xfs_log_item_desc *lidp; | 1152 | struct xfs_log_item_desc *lidp; |
| 1153 | 1153 | ||
| 1154 | ASSERT(lip->li_mountp = tp->t_mountp); | 1154 | ASSERT(lip->li_mountp == tp->t_mountp); |
| 1155 | ASSERT(lip->li_ailp = tp->t_mountp->m_ail); | 1155 | ASSERT(lip->li_ailp == tp->t_mountp->m_ail); |
| 1156 | 1156 | ||
| 1157 | lidp = kmem_zone_zalloc(xfs_log_item_desc_zone, KM_SLEEP | KM_NOFS); | 1157 | lidp = kmem_zone_zalloc(xfs_log_item_desc_zone, KM_SLEEP | KM_NOFS); |
| 1158 | 1158 | ||