Skip to content

Draft: Add back -o hard_remove flag #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Draft: Add back -o hard_remove flag #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions sshfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ struct sshfs {
int nomap;
int disable_hardlink;
int dir_cache;
int hard_remove;
int show_version;
int show_help;
int singlethread;
Expand Down Expand Up @@ -523,7 +524,8 @@ static struct fuse_opt sshfs_opts[] = {
/* For backwards compatibility */
SSHFS_OPT("cache=yes", dir_cache, 1),
SSHFS_OPT("cache=no", dir_cache, 0),

SSHFS_OPT("hard_remove", hard_remove, 1),

FUSE_OPT_KEY("writeback_cache=no", FUSE_OPT_KEY_DISCARD),
FUSE_OPT_KEY("unreliable_append", FUSE_OPT_KEY_DISCARD),

Expand Down Expand Up @@ -1909,7 +1911,10 @@ static void *sshfs_init(struct fuse_conn_info *conn,

// SFTP only supports 1-second time resolution
conn->time_gran = 1000000000;


// force immediate file removal
cfg->hard_remove = sshfs.hard_remove;

return NULL;
}

Expand Down Expand Up @@ -4186,6 +4191,7 @@ int main(int argc, char *argv[])
sshfs.max_conns = 1;
sshfs.ptyfd = -1;
sshfs.dir_cache = 1;
sshfs.hard_remove = 0;
sshfs.show_help = 0;
sshfs.show_version = 0;
sshfs.singlethread = 0;
Expand Down