github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-01-21 18:44:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1206 from trapexit/write-errs

Browse Source 
Fix error handling for cached writes
This commit is contained in:
trapexit 2023-06-29 22:51:34 -05:00 committed by GitHub
commit 832903378e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fuse_write.cpp
View File

@ -22,18 +22,9 @@
#include "fs_movefile.hpp"
#include "fs_pwrite.hpp"
#include "fs_pwriten.hpp"
#include "ugid.hpp"
#include "fuse.h"
#include <string>
#include <vector>
using std::string;
using std::vector;
typedef int (*WriteFunc)(const int,const void*,const size_t,const off_t);
namespace l
{
@ -70,7 +61,7 @@ namespace l
err = fs::dup2(rv,fi_->fd);
fs::close(rv);
if(err < 0)
return err;
return err_;
return fs::pwrite(fi_->fd,buf_,count_,offset_);
}
@ -101,7 +92,7 @@ namespace l
err = fs::dup2(rv,fi_->fd);
fs::close(rv);
if(err < 0)
return err;
return err_;
rv = fs::pwriten(fi_->fd,
buf_ + written_,
@ -111,7 +102,7 @@ namespace l
if(err < 0)
return err;
return (rv + written_);
return (written_ + rv);
}
// When in direct_io mode write's return value should match that of
@ -152,10 +143,8 @@ namespace l
ssize_t rv;
rv = fs::pwriten(fi_->fd,buf_,count_,offset_,&err);
if(rv == (ssize_t)count_)
return count_;
if(rv == 0)
return 0;
if(err == 0)
return rv;
if(err && !l::out_of_space(err))
return err;