diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
| commit | 5f6654094ff35a7a92eb76667788ef633595e4ea (patch) | |
| tree | 8404c5fb245cddbc6877b97a9bf53139c95da852 /fs/xfs/xfs_fsops.c | |
| parent | 5105730fbf6789ff9e20837bdefe32e8ba133595 (diff) | |
| parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
| download | kernel_replicant_linux-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.gz kernel_replicant_linux-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.bz2 kernel_replicant_linux-5f6654094ff35a7a92eb76667788ef633595e4ea.zip | |
Merge tag 'v4.18-rc3' into docs-next
-rc1 broke the docs build due to changes in the e100/e1000 drivers; -rc3
got the fixes via the networking tree. Pull in -rc3 so that the docs tree
can actually build the docs again.
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
| -rw-r--r-- | fs/xfs/xfs_fsops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index a7afcad6b711..3f2bd6032cf8 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c @@ -387,7 +387,7 @@ xfs_reserve_blocks( do { free = percpu_counter_sum(&mp->m_fdblocks) - mp->m_alloc_set_aside; - if (!free) + if (free <= 0) break; delta = request - mp->m_resblks; |