github-mirror/mergerfs
github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-03-15 02:35:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix error handling for cached writes

Browse Source
This commit is contained in:
Antonio SJ Musumeci 2023-06-29 22:50:24 -05:00
parent 7cdd12bda4
commit 2722f4f64d
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_movefile.hpp"
#include "fs_pwrite.hpp" #include "fs_pwrite.hpp"
#include "fs_pwriten.hpp" #include "fs_pwriten.hpp"
#include "ugid.hpp"
#include "fuse.h" #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 namespace l
{ {
@ -70,7 +61,7 @@ namespace l
err = fs::dup2(rv,fi_->fd); err = fs::dup2(rv,fi_->fd);
fs::close(rv); fs::close(rv);
if(err < 0) if(err < 0)
return err; return err_;
return fs::pwrite(fi_->fd,buf_,count_,offset_); return fs::pwrite(fi_->fd,buf_,count_,offset_);
} }
@ -101,7 +92,7 @@ namespace l
err = fs::dup2(rv,fi_->fd); err = fs::dup2(rv,fi_->fd);
fs::close(rv); fs::close(rv);
if(err < 0) if(err < 0)
return err; return err_;
rv = fs::pwriten(fi_->fd, rv = fs::pwriten(fi_->fd,
buf_ + written_, buf_ + written_,
@ -111,7 +102,7 @@ namespace l
if(err < 0) if(err < 0)
return err; return err;
return (rv + written_); return (written_ + rv);
} }
// When in direct_io mode write's return value should match that of // When in direct_io mode write's return value should match that of
@ -152,10 +143,8 @@ namespace l
ssize_t rv; ssize_t rv;
rv = fs::pwriten(fi_->fd,buf_,count_,offset_,&err); rv = fs::pwriten(fi_->fd,buf_,count_,offset_,&err);
if(rv == (ssize_t)count_) if(err == 0)
return count_; return rv;
if(rv == 0)
return 0;
if(err && !l::out_of_space(err)) if(err && !l::out_of_space(err))
return err; return err;