projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xfs-4.7-inode-reclaim' into for-next
[cascardo/linux.git]
/
fs
/
xfs
/
xfs_pnfs.c
diff --git
a/fs/xfs/xfs_pnfs.c
b/fs/xfs/xfs_pnfs.c
index
ade236e
..
3332bae
100644
(file)
--- a/
fs/xfs/xfs_pnfs.c
+++ b/
fs/xfs/xfs_pnfs.c
@@
-308,12
+308,9
@@
xfs_fs_commit_blocks(
goto out_drop_iolock;
}
goto out_drop_iolock;
}
- tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE);
- error = xfs_trans_reserve(tp, &M_RES(mp)->tr_ichange, 0, 0);
- if (error) {
- xfs_trans_cancel(tp);
+ error = xfs_trans_alloc(mp, &M_RES(mp)->tr_ichange, 0, 0, 0, &tp);
+ if (error)
goto out_drop_iolock;
goto out_drop_iolock;
- }
xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);