mirror of
https://github.com/S3NEO/android_kernel_samsung_msm8226.git
synced 2024-09-21 20:11:08 +00:00
[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>
This commit is contained in:
parent
31ca3bc3c5
commit
0cb766ae62
2 changed files with 11 additions and 7 deletions
|
@ -101,12 +101,15 @@ Allowing User Unmounts
|
||||||
======================
|
======================
|
||||||
To permit users to ummount directories that they have user mounted (see above),
|
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
|
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
|
(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
|
mounts, unless umount is invoked with -i (which will avoid invoking a umount
|
||||||
as suid (e.g. "chmod +s /sbin/umount.cifs"). For this utility to succeed
|
helper). As with mount.cifs, to enable user unmounts umount.cifs must be marked
|
||||||
the target path must be a cifs mount, and the uid of the current user must
|
as suid (e.g. "chmod +s /sbin/umount.cifs") or equivalent (some distributions
|
||||||
match the uid of the user who mounted the resource.
|
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
|
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
|
(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
|
This has no effect if the server does not support
|
||||||
Unicode on the wire.
|
Unicode on the wire.
|
||||||
nomapchars Do not translate any of these seven characters (default).
|
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
|
The mount.cifs mount helper also accepts a few mount options before -o
|
||||||
including:
|
including:
|
||||||
|
|
|
@ -178,8 +178,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
|
||||||
server->workstation_RFC1001_name);
|
server->workstation_RFC1001_name);
|
||||||
}
|
}
|
||||||
if(rc) {
|
if(rc) {
|
||||||
set_current_state(TASK_INTERRUPTIBLE);
|
msleep(3000);
|
||||||
schedule_timeout(3 * HZ);
|
|
||||||
} else {
|
} else {
|
||||||
atomic_inc(&tcpSesReconnectCount);
|
atomic_inc(&tcpSesReconnectCount);
|
||||||
spin_lock(&GlobalMid_Lock);
|
spin_lock(&GlobalMid_Lock);
|
||||||
|
|
Loading…
Reference in a new issue