diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-08-28 13:00:44 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-08-28 13:00:44 -0600 |
| commit | cd996fb47c360320cf25ac9503c16de085ea9cfc (patch) | |
| tree | 38a4730b2c031afe7daf632064f9687f1e09194e /fs/xfs/libxfs/xfs_ialloc.c | |
| parent | e9a823fb34a8b0fcba6e112aa1003258a1a5af50 (diff) | |
| parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
Merge tag 'v4.13-rc7' into for-4.14/block-postmerge
Linux 4.13-rc7
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/xfs/libxfs/xfs_ialloc.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_ialloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index ffd5a15d1bb6..abf5beaae907 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -1246,13 +1246,13 @@ xfs_dialloc_ag_inobt( /* free inodes to the left? */ if (useleft && trec.ir_freecount) { - rec = trec; xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR); cur = tcur; pag->pagl_leftrec = trec.ir_startino; pag->pagl_rightrec = rec.ir_startino; pag->pagl_pagino = pagino; + rec = trec; goto alloc_inode; } |