[stable9] Fix call to disk_free_space when a file is provided #22912

Merged
merged 1 commit into from Mar 10, 2016

Projects

None yet

6 participants

@PVince81
Collaborator
PVince81 commented Mar 7, 2016

Backport of #22900 to stable9

Please review @icewind1991 @MorrisJobke @rullzer @nickvergessen

@PVince81 PVince81 added this to the 9.0.1-next-maintenance milestone Mar 7, 2016
@mention-bot

By analyzing the blame information on this pull request, we identified @DeepDiver1975, @icewind1991 and @pluijm to be potential reviewers

@rullzer
Contributor
rullzer commented Mar 7, 2016

๐Ÿ‘

@PVince81
Collaborator
PVince81 commented Mar 9, 2016

Fixes #22899

@PVince81 PVince81 Fix call to disk_free_space when a file is provided
In the case of shared files, we have to call free_space() on the file
name. This has the side-effect that when uploading to a local storage
without quota set, it will call disk_free_space with the file name,
which fails.

This fix uses the parent folder in case the given path is a file.
11f76b2
@PVince81
Collaborator
PVince81 commented Mar 9, 2016

Rebased for CI

@icewind1991
Member

๐Ÿ‘

@DeepDiver1975 DeepDiver1975 merged commit 730620c into stable9 Mar 10, 2016

20 of 21 checks passed

core-ci-linux/database=oci,label=SLAVE Build #27808 failed in 1 hr 29 min
Details
cla-bot-core Build #2084 succeeded in 11 sec
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #59153 succeeded in 10 min
Details
core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #53120 succeeded in 49 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #27808 succeeded in 53 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #27808 succeeded in 27 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #27808 succeeded in 17 min
Details
ocs-api-integration-tests-ci Build #8226 succeeded in 11 min
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #8051 succeeded in 1 min 41 sec
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #8051 succeeded in 4 min 30 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #8051 succeeded in 7 min 37 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #8424 succeeded in 2 min 20 sec
Details
server-master-linux-php5.4-ci/database=sqlite,label=SLAVE Build #451 succeeded in 13 min
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #35911 succeeded in 13 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #12430 succeeded in 5 min 4 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #12430 succeeded in 18 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #12430 succeeded in 31 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #12430 succeeded in 10 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #12430 succeeded in 29 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #12430 succeeded in 16 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #12430 succeeded in 13 min
Details
@DeepDiver1975 DeepDiver1975 deleted the stable9-diskfreespace-filesworkaround branch Mar 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment