Mirror
/
mergerfs
mirror of https://github.com/trapexit/mergerfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

ensure marking open files renamed over as hidden

pull/622/head
Antonio SJ Musumeci 6 years ago
parent
af1c0d78e8
commit
3a66a68edb
1 changed files with 67 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      libfuse/lib/fuse.c

80
libfuse/lib/fuse.c
View File

@ -2888,35 +2888,40 @@ static void fuse_lib_mkdir(fuse_req_t req, fuse_ino_t parent, const char *name,
reply_entry(req, &e, err);
}
static void fuse_lib_unlink(fuse_req_t req, fuse_ino_t parent,
static
void
fuse_lib_unlink(fuse_req_t req,
fuse_ino_t parent,
const char *name)
{
struct fuse *f = req_fuse_prepare(req);
struct node *wnode;
char *path;
int err;
err = get_path_wrlock(f, parent, name, &path, &wnode);
if (!err) {
char *path;
struct fuse *f;
struct node *wnode;
struct fuse_intr_data d;
fuse_prepare_interrupt(f, req, &d);
f = req_fuse_prepare(req);
err = get_path_wrlock(f,parent,name,&path,&wnode);
if(!err)
{
fuse_prepare_interrupt(f,req,&d);
if(node_open_and_visible(wnode))
{
err = fuse_fs_prepare_hide(f->fs, path, &wnode->hidden_fh, 0);
err = fuse_fs_prepare_hide(f->fs,path,&wnode->hidden_fh,0);
if(!err)
wnode->is_hidden = 1;
}
err = fuse_fs_unlink(f->fs, path);
err = fuse_fs_unlink(f->fs,path);
if(!err && !wnode->is_hidden)
remove_node(f, parent, name);
remove_node(f,parent,name);
fuse_finish_interrupt(f, req, &d);
free_path_wrlock(f, parent, wnode, path);
fuse_finish_interrupt(f,req,&d);
free_path_wrlock(f,parent,wnode,path);
}
reply_err(req, err);
reply_err(req,err);
}
static void fuse_lib_rmdir(fuse_req_t req, fuse_ino_t parent, const char *name)
@ -2962,38 +2967,45 @@ static void fuse_lib_symlink(fuse_req_t req, const char *linkname,
reply_entry(req, &e, err);
}
static void fuse_lib_rename(fuse_req_t req, fuse_ino_t olddir,
const char *oldname, fuse_ino_t newdir,
static
void
fuse_lib_rename(fuse_req_t req,
fuse_ino_t olddir,
const char *oldname,
fuse_ino_t newdir,
const char *newname)
{
struct fuse *f = req_fuse_prepare(req);
int err;
struct fuse *f;
char *oldpath;
char *newpath;
struct node *wnode1;
struct node *wnode2;
int err;
struct fuse_intr_data d;
err = get_path2(f, olddir, oldname, newdir, newname,
&oldpath, &newpath, &wnode1, &wnode2);
f = req_fuse_prepare(req);
err = get_path2(f,olddir,oldname,newdir,newname,
&oldpath,&newpath,&wnode1,&wnode2);
if (!err) {
struct fuse_intr_data d;
err = 0;
fuse_prepare_interrupt(f, req, &d);
if(!err)
{
fuse_prepare_interrupt(f,req,&d);
if(node_open_and_visible(wnode2))
err = fuse_fs_prepare_hide(f->fs, newpath, &wnode2->hidden_fh, 1);
if (!err)
{
err = fuse_fs_rename(f->fs, oldpath, newpath);
if (!err)
err = rename_node(f, olddir, oldname, newdir, newname);
err = fuse_fs_prepare_hide(f->fs,newpath,&wnode2->hidden_fh,1);
if(!err)
wnode2->is_hidden = 1;
}
fuse_finish_interrupt(f, req, &d);
free_path2(f, olddir, newdir, wnode1, wnode2, oldpath, newpath);
err = fuse_fs_rename(f->fs,oldpath,newpath);
if(!err)
err = rename_node(f,olddir,oldname,newdir,newname);
fuse_finish_interrupt(f,req,&d);
free_path2(f,olddir,newdir,wnode1,wnode2,oldpath,newpath);
}
reply_err(req, err);
reply_err(req,err);
}
static void fuse_lib_link(fuse_req_t req, fuse_ino_t ino, fuse_ino_t newparent,

Write Preview
Loading…
Cancel
Save