diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-04 12:10:50 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-04 12:10:50 +1100 |
| commit | a03c13354f0dd65c24915a1c7248dc4e90aa96a0 (patch) | |
| tree | f5e92cafcd6ed8accb82bba0bfa638d888c9f9ae /fs/xfs/xfs_inode.c | |
| parent | a939541ef465da1eafdf28376d0bc0bbdbddca57 (diff) | |
| parent | a21cd503678286c56b1d0cca1c99349a4aa042f4 (diff) | |
Merge remote-tracking branch 'xfs/for-next'
Conflicts:
fs/xfs/xfs_buf_item.c
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 66282dcb821b..4f201656d2d9 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2379,9 +2379,6 @@ xfs_iflush_fork( char *cp; xfs_ifork_t *ifp; xfs_mount_t *mp; -#ifdef XFS_TRANS_DEBUG - int first; -#endif static const short brootflag[2] = { XFS_ILOG_DBROOT, XFS_ILOG_ABROOT }; static const short dataflag[2] = @@ -2724,9 +2721,6 @@ xfs_iflush_int( xfs_inode_log_item_t *iip; xfs_dinode_t *dip; xfs_mount_t *mp; -#ifdef XFS_TRANS_DEBUG - int first; -#endif ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); ASSERT(xfs_isiflocked(ip)); |