diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 08:28:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 08:28:32 +0200 |
| commit | 714c95ce8bad7a2042006fc9a2079fcd469b6a03 (patch) | |
| tree | cdf9f5a6fcbb389f555584ef64ee911eefeb1777 /fs/xfs/xfs_fsops.c | |
| parent | usb: typec: function for checking cable plug orientation (diff) | |
| parent | Linux 4.18-rc3 (diff) | |
| download | linux-714c95ce8bad7a2042006fc9a2079fcd469b6a03.tar.xz linux-714c95ce8bad7a2042006fc9a2079fcd469b6a03.zip | |
Merge 4.18-rc3 into usb-next
We want the USB and other fixes in here as well to make merges and
testing easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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; |