diff options
| author | Steve French <smfrench@austin.rr.com> | 2005-04-28 22:41:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-28 22:41:11 -0700 |
| commit | 0cb766ae629c70d53040f85de73db0583eadb233 (patch) | |
| tree | b763f4acf57f69b51d00a3a62ad30cb91b02baba /fs/cifs/README | |
| parent | 31ca3bc3c569f9fe02aae6974ac3a9126f14902f (diff) | |
| download | linux-3.10-0cb766ae629c70d53040f85de73db0583eadb233.tar.gz linux-3.10-0cb766ae629c70d53040f85de73db0583eadb233.tar.bz2 linux-3.10-0cb766ae629c70d53040f85de73db0583eadb233.zip | |
[PATCH] cifs: Do not sleep interruptible after socket connect failure
.. since it can be due to pending kill.
Update readme information to better describe cifs umount
Signed-off-by: Steve French (sfrench@us.ibm.com)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/cifs/README')
| -rw-r--r-- | fs/cifs/README | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/cifs/README b/fs/cifs/README index bec7b3fc8a7..7b4ac096cd1 100644 --- a/fs/cifs/README +++ b/fs/cifs/README @@ -101,12 +101,15 @@ Allowing User Unmounts ====================== To permit users to ummount directories that they have user mounted (see above), the utility umount.cifs may be used. It may be invoked directly, or if -umount.cifs is placed in /sbin, umount -i can invoke the cifs umount helper +umount.cifs is placed in /sbin, umount can invoke the cifs umount helper (at least for most versions of the umount utility) for umount of cifs -mounts. As with mount.cifs, to enable user unmounts umount.cifs must be marked -as suid (e.g. "chmod +s /sbin/umount.cifs"). For this utility to succeed -the target path must be a cifs mount, and the uid of the current user must -match the uid of the user who mounted the resource. +mounts, unless umount is invoked with -i (which will avoid invoking a umount +helper). As with mount.cifs, to enable user unmounts umount.cifs must be marked +as suid (e.g. "chmod +s /sbin/umount.cifs") or equivalent (some distributions +allow adding entries to a file to the /etc/permissions file to achieve the +equivalent suid effect). For this utility to succeed the target path +must be a cifs mount, and the uid of the current user must match the uid +of the user who mounted the resource. Also note that the customary way of allowing user mounts and unmounts is (instead of using mount.cifs and unmount.cifs as suid) to add a line @@ -404,6 +407,8 @@ A partial list of the supported mount options follows: This has no effect if the server does not support Unicode on the wire. nomapchars Do not translate any of these seven characters (default). + remount remount the share (often used to change from ro to rw mounts + or vice versa) The mount.cifs mount helper also accepts a few mount options before -o including: |