From 9873da90ebf9ca8fa5835970ff9361f035d7e9fd Mon Sep 17 00:00:00 2001 From: Steve French Date: Sat, 6 Jun 2009 21:09:39 +0000 Subject: [PATCH] --- yaml --- r: 146467 b: refs/heads/master c: f0472d0ec89bef2ea4432828c3daa1b26ef569aa h: refs/heads/master i: 146465: b6136dbd39053e487855f22d5719a4de3261dd10 146463: 88624af571baadeee13398f1c53fd1d319ea4ce7 v: v3 --- [refs] | 2 +- trunk/fs/cifs/CHANGES | 5 ++++- trunk/fs/cifs/README | 9 ++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8196788b44cb..f8ce37e8287a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ae1507f6d266d0cc3dd36e474d83aad70fec9e4 +refs/heads/master: f0472d0ec89bef2ea4432828c3daa1b26ef569aa diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES index 227c681b816d..b48689839428 100644 --- a/trunk/fs/cifs/CHANGES +++ b/trunk/fs/cifs/CHANGES @@ -2,7 +2,10 @@ Version 1.59 ------------ Client uses server inode numbers (which are persistent) rather than client generated ones by default (mount option "serverino" turned -on by default if server supports it). +on by default if server supports it). Add forceuid and forcegid +mount options (so that when negotiating unix extensions specifying +which uid mounted does not immediately force the server's reported +uids to be overridden). Version 1.58 ------------ diff --git a/trunk/fs/cifs/README b/trunk/fs/cifs/README index 6d1608fabde9..ad92921dbde4 100644 --- a/trunk/fs/cifs/README +++ b/trunk/fs/cifs/README @@ -262,7 +262,8 @@ 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 - uid Set the default uid for inodes. For mounts to servers + 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 @@ -292,6 +293,12 @@ A partial list of the supported mount options follows: 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). file_mode If CIFS Unix extensions are not supported by the server this overrides the default mode for file inodes.