diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-07-13 07:30:11 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-07-13 07:30:22 (GMT) |
| commit | cf056edbbe70393faa6edd2b7859a14467910946 (patch) | |
| tree | ca30ef021f12d1f06e18856a60f815ba63e78f60 /fs/xfs/xfs_trans.c | |
| parent | 58b6542b50ded4243c26c251c0507e5f658642f6 (diff) | |
| parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) | |
| download | linux-fsl-qoriq-cf056edbbe70393faa6edd2b7859a14467910946.tar.xz | |
Merge 3.0-rc7 into drm-core-next
This pulls in all the drm fixes up to this point which are needed
for some -next patches to work.
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 7c7bc2b..c83f63b 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -1361,7 +1361,7 @@ xfs_trans_item_committed( lip->li_flags |= XFS_LI_ABORTED; item_lsn = IOP_COMMITTED(lip, commit_lsn); - /* If the committed routine returns -1, item has been freed. */ + /* item_lsn of -1 means the item needs no further processing */ if (XFS_LSN_CMP(item_lsn, (xfs_lsn_t)-1) == 0) return; @@ -1474,7 +1474,7 @@ xfs_trans_committed_bulk( lip->li_flags |= XFS_LI_ABORTED; item_lsn = IOP_COMMITTED(lip, commit_lsn); - /* item_lsn of -1 means the item was freed */ + /* item_lsn of -1 means the item needs no further processing */ if (XFS_LSN_CMP(item_lsn, (xfs_lsn_t)-1) == 0) continue; |