[PATCH] cifs: update the README with information about uid=/forceuid/noforceuid

[Jeff Layton]

...and the corresponding gid options. Add some detail about how the
union of these options is intended to work.

Signed-off-by: Jeff Layton <jlayton at redhat.com>
---
 fs/cifs/README |   55 +++++++++++++++++--------------------------------------
 1 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/fs/cifs/README b/fs/cifs/README
index ad92921..a0223f5 100644
--- a/fs/cifs/README
+++ b/fs/cifs/README
@@ -262,44 +262,23 @@ A partial list of the supported mount options follows:
 		mount.	
   domain	Set the SMB/CIFS workgroup name prepended to the
 		username during CIFS session establishment
-  forceuid	Set the default uid for inodes based on the uid
-		passed in. For mounts to servers
-		which do support the CIFS Unix extensions, such as a
-		properly configured Samba server, the server provides
-		the uid, gid and mode so this parameter should  not be
-		specified unless the server and clients uid and gid
-		numbering differ.  If the server and client are in the
-		same domain (e.g. running winbind or nss_ldap) and
-		the server supports the Unix Extensions then the uid
-		and gid can be retrieved from the server (and uid
-		and gid would not have to be specifed on the mount. 
-		For servers which do not support the CIFS Unix
-		extensions, the default uid (and gid) returned on lookup
-		of existing files will be the uid (gid) of the person
-		who executed the mount (root, except when mount.cifs
-		is configured setuid for user mounts) unless the "uid=" 
-		(gid) mount option is specified.  For the uid (gid) of newly
-		created files and directories, ie files created since 
-		the last mount of the server share, the expected uid 
-		(gid) is cached as long as the inode remains in 
-		memory on the client.   Also note that permission
-		checks (authorization checks) on accesses to a file occur
-		at the server, but there are cases in which an administrator
-		may want to restrict at the client as well.  For those
-		servers which do not report a uid/gid owner
-		(such as Windows), permissions can also be checked at the
-		client, and a crude form of client side permission checking 
-		can be enabled by specifying file_mode and dir_mode on 
-		the client.  Note that the mount.cifs helper must be
-		at version 1.10 or higher to support specifying the uid
-		(or gid) in non-numeric form.
-  forcegid	(similar to above but for the groupid instead of uid)
-  uid		Set the default uid for inodes, and indicate to the
-		cifs kernel driver which local user mounted . If the server
-		supports the unix extensions the default uid is
-		not used to fill in the owner fields of inodes (files)
-		unless the "forceuid" parameter is specified.
-  gid		Set the default gid for inodes (similar to above).
+  uid		Set the ownership for all inodes, and indicate to the
+		cifs kernel driver which local user initiated the mount.
+		If the server supports the unix extensions, the owner provided
+		by the server will be overridden in favor of the one provided
+		by this option. To disable this behavior use "noforceuid".
+  noforceuid	Disable overriding ownership information from the server. With
+		this option, the value given in the uid= option will only be
+		used if the server does not provide one.
+  forceuid	Reverse a previously specified noforceuid option.
+  gid		Set the group ownership for all inodes. If the server supports
+		the unix extensions, the group provided by the server will be
+		overridden in favor of the one provided by this option. To
+		disable this behavior use "noforcegid".
+  noforcegid	Disable overriding group ownership information from the server.
+		With this option, the value given in the gid= option will only
+		be used if the server does not provide one.
+  forcegid	Reverse a previously specified noforcegid option.
   file_mode     If CIFS Unix extensions are not supported by the server
 		this overrides the default mode for file inodes.
   dir_mode      If CIFS Unix extensions are not supported by the server 
-- 
1.6.0.6


--MP_/+vrxj7YMiqP6Rx3OdEBFNUT
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename=0001-manpage-update-the-mount.cifs-manpage-to-reflect-ch.patch