Skip to content

Commit

Permalink
Trim excess whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
a1346054 committed Sep 16, 2021
1 parent a181b9b commit 7c2124c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 12 deletions.
4 changes: 0 additions & 4 deletions ChangeLog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ Release 3.7.2 (2021-06-08)
tried - returning EEXIST if the access was successful.
Fixes: https://github.com/libfuse/sshfs/issues/243


Release 3.7.1 (2020-11-09)
--------------------------

* Minor bugfixes.


Release 3.7.0 (2020-01-03)
--------------------------

Expand All @@ -25,7 +23,6 @@ Release 3.7.0 (2020-01-03)
needed anymore. If you depend on this workaround, please let the SSHFS maintainers know,
otherwise support for the workaround will be removed completely in a future version.


Release 3.6.0 (2019-11-03)
--------------------------

Expand All @@ -38,7 +35,6 @@ Release 3.6.0 (2019-11-03)
* Fixed a number of compiler warnings.
* Improved performance under OS X.


Release 3.5.2 (2019-04-13)
--------------------------

Expand Down
1 change: 0 additions & 1 deletion cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ static int cache_readlink(const char *path, char *buf, size_t size)
return err;
}


static int cache_opendir(const char *path, struct fuse_file_info *fi)
{
(void) path;
Expand Down
12 changes: 6 additions & 6 deletions sshfs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ By default, only the mounting user will be able to access the filesystem. Access
users can be enabled by passing ``-o allow_other``. In this case you most likely also
want to use ``-o default_permissions``.

It is recommended to run SSHFS as regular user (not as root). For this to work the
mountpoint must be owned by the user. If username is omitted SSHFS will use the local
username. If the directory is omitted, SSHFS will mount the (remote) home directory. If
It is recommended to run SSHFS as regular user (not as root). For this to work the
mountpoint must be owned by the user. If username is omitted SSHFS will use the local
username. If the directory is omitted, SSHFS will mount the (remote) home directory. If
you need to enter a password sshfs will ask for it (actually it just runs ssh which ask
for the password if needed).

Expand Down Expand Up @@ -158,7 +158,7 @@ Options

-o passive
communicate over stdin and stdout bypassing network. Useful for
mounting local filesystem on the remote side. An example using
mounting local filesystem on the remote side. An example using
dpipe command would be ``dpipe /usr/lib/openssh/sftp-server = ssh
RemoteHostname sshfs :/directory/to/be/shared ~/mnt/src -o passive``

Expand Down Expand Up @@ -186,7 +186,7 @@ Options
read password from stdin (only for pam_mount!)

-o dir_cache=BOOL
Enables (*yes*) or disables (*no*) the SSHFS directory cache. The
Enables (*yes*) or disables (*no*) the SSHFS directory cache. The
directory cache holds the names of directory entries. Enabling it
allows `readdir(3)` system calls to be processed without network
access.
Expand All @@ -198,7 +198,7 @@ Options
sets timeout for directory cache in seconds.

-o dcache_{stat,link,dir}_timeout=N
sets separate timeout for {attributes, symlinks, names} in the
sets separate timeout for {attributes, symlinks, names} in the
directory cache.

-o dcache_clean_interval=N
Expand Down
1 change: 0 additions & 1 deletion test/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ def cleanup(mount_process, mnt_dir):
except subprocess.TimeoutExpired:
mount_process.kill()


def umount(mount_process, mnt_dir):
subprocess.check_call(['fusermount3', '-z', '-u', mnt_dir ])
assert not os.path.ismount(mnt_dir)
Expand Down

0 comments on commit 7c2124c

Please sign in to comment.