projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xfs-generic-sb-counters' into for-next
[deliverable/linux.git]
/
fs
/
xfs
/
libxfs
/
xfs_ialloc.c
diff --git
a/fs/xfs/libxfs/xfs_ialloc.c
b/fs/xfs/libxfs/xfs_ialloc.c
index db0444893e960cebfcd9040a35f03b81e3bd4f2c..07349a183a110fdf57bdf9a7f1d704452de5cdb7 100644
(file)
--- a/
fs/xfs/libxfs/xfs_ialloc.c
+++ b/
fs/xfs/libxfs/xfs_ialloc.c
@@
-376,7
+376,8
@@
xfs_ialloc_ag_alloc(
*/
newlen = args.mp->m_ialloc_inos;
if (args.mp->m_maxicount &&
*/
newlen = args.mp->m_ialloc_inos;
if (args.mp->m_maxicount &&
- args.mp->m_sb.sb_icount + newlen > args.mp->m_maxicount)
+ percpu_counter_read(&args.mp->m_icount) + newlen >
+ args.mp->m_maxicount)
return -ENOSPC;
args.minlen = args.maxlen = args.mp->m_ialloc_blks;
/*
return -ENOSPC;
args.minlen = args.maxlen = args.mp->m_ialloc_blks;
/*
@@
-1340,7
+1341,8
@@
xfs_dialloc(
* inode.
*/
if (mp->m_maxicount &&
* inode.
*/
if (mp->m_maxicount &&
- mp->m_sb.sb_icount + mp->m_ialloc_inos > mp->m_maxicount) {
+ percpu_counter_read(&mp->m_icount) + mp->m_ialloc_inos >
+ mp->m_maxicount) {
noroom = 1;
okalloc = 0;
}
noroom = 1;
okalloc = 0;
}
This page took
0.030714 seconds
and
5
git commands to generate.