rt/mergerfs
1
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-26 19:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

use temp files (then rename) when moving files for moveonenospc

Browse source
This commit is contained in:
Antonio SJ Musumeci 2017-06-28 21:17:47 -04:00
parent fa3ff40218
commit aea2b40dda
4 changed files with 86 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/fs_movefile.cpp
View file

@ -15,6 +15,7 @@
*/
#include <fcntl.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@ -22,9 +23,12 @@
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_base_open.hpp"
#include "fs_base_close.hpp"
#include "fs_base_mkstemp.hpp"
#include "fs_base_rename.hpp"
#include "fs_base_unlink.hpp"
#include "fs_base_stat.hpp"
#include "fs_clonefile.hpp"
@ -49,6 +53,7 @@ namespace fs
string fusedir;
string fdin_path;
string fdout_path;
string fdout_temp;
struct stat fdin_st;
fdin = origfd;
@ -82,18 +87,22 @@ namespace fs
return -1;
fs::path::append(fdout_path,fusepath);
fdout = fs::open(fdout_path,fdin_flags|O_CREAT,fdin_st.st_mode);
fdout_temp = fdout_path;
fdout = fs::mkstemp(fdout_temp);
if(fdout == -1)
return -1;
rv = fs::clonefile(fdin,fdout);
if(rv == -1)
{
fs::close(fdin);
fs::close(fdout);
fs::unlink(fdout_path);
return -1;
}
goto cleanup;
rv = fs::setfl(fdout,fdin_flags);
if(rv == -1)
goto cleanup;
rv = fs::rename(fdout_temp,fdout_path);
if(rv == -1)
goto cleanup;
// should we care if it fails?
fs::unlink(fdin_path);
@ -103,5 +112,15 @@ namespace fs
fs::close(fdout);
return 0;
cleanup:
rv = errno;
if(fdin != -1)
fs::close(fdin);
if(fdout != -1)
fs::close(fdout);
fs::unlink(fdout_temp);
errno = rv;
return -1;
}
}