[CIFS] fix checkpatch warnings in fs/cifs/inode.c
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French
parent
88e7d705c4
commit
f6d0998219
|
|
@ -56,7 +56,8 @@ the CIFS VFS web site) copy it to the same directory in which mount.smbfs and
|
|||
similar files reside (usually /sbin). Although the helper software is not
|
||||
required, mount.cifs is recommended. Eventually the Samba 3.0 utility program
|
||||
"net" may also be helpful since it may someday provide easier mount syntax for
|
||||
users who are used to Windows e.g. net use <mount point> <UNC name or cifs URL>
|
||||
users who are used to Windows e.g.
|
||||
net use <mount point> <UNC name or cifs URL>
|
||||
Note that running the Winbind pam/nss module (logon service) on all of your
|
||||
Linux clients is useful in mapping Uids and Gids consistently across the
|
||||
domain to the proper network user. The mount.cifs mount helper can be
|
||||
|
|
@ -248,7 +249,7 @@ A partial list of the supported mount options follows:
|
|||
the CIFS session.
|
||||
password The user password. If the mount helper is
|
||||
installed, the user will be prompted for password
|
||||
if it is not supplied.
|
||||
if not supplied.
|
||||
ip The ip address of the target server
|
||||
unc The target server Universal Network Name (export) to
|
||||
mount.
|
||||
|
|
@ -283,7 +284,7 @@ A partial list of the supported mount options follows:
|
|||
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-numberic form.
|
||||
(or gid) in non-numeric form.
|
||||
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.
|
||||
|
|
@ -417,9 +418,10 @@ A partial list of the supported mount options follows:
|
|||
acl Allow setfacl and getfacl to manage posix ACLs if server
|
||||
supports them. (default)
|
||||
noacl Do not allow setfacl and getfacl calls on this mount
|
||||
user_xattr Allow getting and setting user xattrs as OS/2 EAs (extended
|
||||
attributes) to the server (default) e.g. via setfattr
|
||||
and getfattr utilities.
|
||||
user_xattr Allow getting and setting user xattrs (those attributes whose
|
||||
name begins with "user." or "os2.") as OS/2 EAs (extended
|
||||
attributes) to the server. This allows support of the
|
||||
setfattr and getfattr utilities. (default)
|
||||
nouser_xattr Do not allow getfattr/setfattr to get/set/list xattrs
|
||||
mapchars Translate six of the seven reserved characters (not backslash)
|
||||
*?<>|:
|
||||
|
|
@ -434,6 +436,7 @@ A partial list of the supported mount options follows:
|
|||
nomapchars Do not translate any of these seven characters (default).
|
||||
nocase Request case insensitive path name matching (case
|
||||
sensitive is the default if the server suports it).
|
||||
(mount option "ignorecase" is identical to "nocase")
|
||||
posixpaths If CIFS Unix extensions are supported, attempt to
|
||||
negotiate posix path name support which allows certain
|
||||
characters forbidden in typical CIFS filenames, without
|
||||
|
|
@ -485,6 +488,9 @@ A partial list of the supported mount options follows:
|
|||
ntlmv2i Use NTLMv2 password hashing with packet signing
|
||||
lanman (if configured in kernel config) use older
|
||||
lanman hash
|
||||
hard Retry file operations if server is not responding
|
||||
soft Limit retries to unresponsive servers (usually only
|
||||
one retry) before returning an error. (default)
|
||||
|
||||
The mount.cifs mount helper also accepts a few mount options before -o
|
||||
including:
|
||||
|
|
@ -535,8 +541,8 @@ SecurityFlags Flags which control security negotiation and
|
|||
must use NTLM 0x02002
|
||||
may use NTLMv2 0x00004
|
||||
must use NTLMv2 0x04004
|
||||
may use Kerberos security (not implemented yet) 0x00008
|
||||
must use Kerberos (not implemented yet) 0x08008
|
||||
may use Kerberos security 0x00008
|
||||
must use Kerberos 0x08008
|
||||
may use lanman (weak) password hash 0x00010
|
||||
must use lanman password hash 0x10010
|
||||
may use plaintext passwords 0x00020
|
||||
|
|
@ -626,6 +632,6 @@ returned success.
|
|||
|
||||
Also note that "cat /proc/fs/cifs/DebugData" will display information about
|
||||
the active sessions and the shares that are mounted.
|
||||
Enabling Kerberos (extended security) works when CONFIG_CIFS_EXPERIMENTAL is enabled
|
||||
but requires a user space helper (from the Samba project). NTLM and NTLMv2 and
|
||||
LANMAN support do not require this helpr.
|
||||
Enabling Kerberos (extended security) works when CONFIG_CIFS_EXPERIMENTAL is
|
||||
on but requires a user space helper (from the Samba project). NTLM and NTLMv2 and
|
||||
LANMAN support do not require this helper.
|
||||
|
|
|
|||
14
fs/cifs/TODO
14
fs/cifs/TODO
|
|
@ -1,4 +1,4 @@
|
|||
Version 1.49 April 26, 2007
|
||||
Version 1.52 January 3, 2008
|
||||
|
||||
A Partial List of Missing Features
|
||||
==================================
|
||||
|
|
@ -16,16 +16,14 @@ SecurityDescriptors
|
|||
c) Better pam/winbind integration (e.g. to handle uid mapping
|
||||
better)
|
||||
|
||||
d) Verify that Kerberos signing works
|
||||
|
||||
e) Cleanup now unneeded SessSetup code in
|
||||
d) Cleanup now unneeded SessSetup code in
|
||||
fs/cifs/connect.c and add back in NTLMSSP code if any servers
|
||||
need it
|
||||
|
||||
f) MD5-HMAC signing SMB PDUs when SPNEGO style SessionSetup
|
||||
used (Kerberos or NTLMSSP). Signing alreadyimplemented for NTLM
|
||||
and raw NTLMSSP already. This is important when enabling
|
||||
extended security and mounting to Windows 2003 Servers
|
||||
e) ms-dfs and ms-dfs host name resolution cleanup
|
||||
|
||||
f) fix NTLMv2 signing when two mounts with different users to same
|
||||
server.
|
||||
|
||||
g) Directory entry caching relies on a 1 second timer, rather than
|
||||
using FindNotify or equivalent. - (started)
|
||||
|
|
|
|||
|
|
@ -54,9 +54,9 @@ int cifs_get_inode_info_unix(struct inode **pinode,
|
|||
MAX_TREE_SIZE + 1) +
|
||||
strnlen(search_path, MAX_PATHCONF) + 1,
|
||||
GFP_KERNEL);
|
||||
if (tmp_path == NULL) {
|
||||
if (tmp_path == NULL)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
/* have to skip first of the double backslash of
|
||||
UNC name */
|
||||
strncpy(tmp_path, pTcon->treeName, MAX_TREE_SIZE);
|
||||
|
|
@ -511,7 +511,8 @@ int cifs_get_inode_info(struct inode **pinode,
|
|||
}
|
||||
|
||||
spin_lock(&inode->i_lock);
|
||||
if (is_size_safe_to_change(cifsInfo, le64_to_cpu(pfindData->EndOfFile))) {
|
||||
if (is_size_safe_to_change(cifsInfo,
|
||||
le64_to_cpu(pfindData->EndOfFile))) {
|
||||
/* can not safely shrink the file size here if the
|
||||
client is writing to it due to potential races */
|
||||
i_size_write(inode, le64_to_cpu(pfindData->EndOfFile));
|
||||
|
|
@ -931,7 +932,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
|
|||
(CIFS_UNIX_POSIX_PATH_OPS_CAP &
|
||||
le64_to_cpu(pTcon->fsUnixInfo.Capability))) {
|
||||
u32 oplock = 0;
|
||||
FILE_UNIX_BASIC_INFO * pInfo =
|
||||
FILE_UNIX_BASIC_INFO *pInfo =
|
||||
kzalloc(sizeof(FILE_UNIX_BASIC_INFO), GFP_KERNEL);
|
||||
if (pInfo == NULL) {
|
||||
rc = -ENOMEM;
|
||||
|
|
@ -1610,10 +1611,11 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
|
|||
#ifdef CONFIG_CIFS_EXPERIMENTAL
|
||||
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL)
|
||||
rc = mode_to_acl(direntry->d_inode, full_path, mode);
|
||||
else if ((mode & S_IWUGO) == 0) /* not writeable */ {
|
||||
else if ((mode & S_IWUGO) == 0) {
|
||||
#else
|
||||
if ((mode & S_IWUGO) == 0) /* not writeable */ {
|
||||
if ((mode & S_IWUGO) == 0) {
|
||||
#endif
|
||||
/* not writeable */
|
||||
if ((cifsInode->cifsAttrs & ATTR_READONLY) == 0) {
|
||||
set_dosattr = TRUE;
|
||||
time_buf.Attributes =
|
||||
|
|
|
|||
Reference in New Issue