Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
61e74801
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
61e74801
编写于
12月 03, 2008
作者:
S
Steve French
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[CIFS] various minor cleanups pointed out by checkpatch script
Signed-off-by:
N
Steve French
<
sfrench@us.ibm.com
>
上级
3de2091a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
29 addition
and
37 deletion
+29
-37
fs/cifs/AUTHORS
fs/cifs/AUTHORS
+2
-0
fs/cifs/cifsfs.c
fs/cifs/cifsfs.c
+7
-12
fs/cifs/cifspdu.h
fs/cifs/cifspdu.h
+1
-1
fs/cifs/cifssmb.c
fs/cifs/cifssmb.c
+8
-8
fs/cifs/connect.c
fs/cifs/connect.c
+7
-11
fs/cifs/dir.c
fs/cifs/dir.c
+4
-5
未找到文件。
fs/cifs/AUTHORS
浏览文件 @
61e74801
...
...
@@ -36,7 +36,9 @@ Miklos Szeredi
Kazeon team for various fixes especially for 2.4 version.
Asser Ferno (Change Notify support)
Shaggy (Dave Kleikamp) for inumerable small fs suggestions and some good cleanup
Gunter Kukkukk (testing and suggestions for support of old servers)
Igor Mammedov (DFS support)
Jeff Layton (many, many fixes, as well as great work on the cifs Kerberos code)
Test case and Bug Report contributors
-------------------------------------
...
...
fs/cifs/cifsfs.c
浏览文件 @
61e74801
...
...
@@ -347,7 +347,6 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
if
(
cifs_sb
)
{
tcon
=
cifs_sb
->
tcon
;
if
(
tcon
)
{
/* BB add prepath to mount options displayed */
seq_printf
(
s
,
",unc=%s"
,
cifs_sb
->
tcon
->
treeName
);
if
(
tcon
->
ses
)
{
if
(
tcon
->
ses
->
userName
)
...
...
@@ -439,9 +438,8 @@ int cifs_xquota_set(struct super_block *sb, int quota_type, qid_t qid,
xid
=
GetXid
();
if
(
pTcon
)
{
cFYI
(
1
,
(
"set type: 0x%x id: %d"
,
quota_type
,
qid
));
}
else
{
}
else
rc
=
-
EIO
;
}
FreeXid
(
xid
);
return
rc
;
...
...
@@ -463,9 +461,8 @@ int cifs_xquota_get(struct super_block *sb, int quota_type, qid_t qid,
xid
=
GetXid
();
if
(
pTcon
)
{
cFYI
(
1
,
(
"set type: 0x%x id: %d"
,
quota_type
,
qid
));
}
else
{
}
else
rc
=
-
EIO
;
}
FreeXid
(
xid
);
return
rc
;
...
...
@@ -486,9 +483,8 @@ int cifs_xstate_set(struct super_block *sb, unsigned int flags, int operation)
xid
=
GetXid
();
if
(
pTcon
)
{
cFYI
(
1
,
(
"flags: 0x%x operation: 0x%x"
,
flags
,
operation
));
}
else
{
}
else
rc
=
-
EIO
;
}
FreeXid
(
xid
);
return
rc
;
...
...
@@ -501,17 +497,16 @@ int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats)
struct
cifs_sb_info
*
cifs_sb
=
CIFS_SB
(
sb
);
struct
cifsTconInfo
*
pTcon
;
if
(
cifs_sb
)
{
if
(
cifs_sb
)
pTcon
=
cifs_sb
->
tcon
;
}
else
{
else
return
-
EIO
;
}
xid
=
GetXid
();
if
(
pTcon
)
{
cFYI
(
1
,
(
"pqstats %p"
,
qstats
));
}
else
{
}
else
rc
=
-
EIO
;
}
FreeXid
(
xid
);
return
rc
;
...
...
fs/cifs/cifspdu.h
浏览文件 @
61e74801
...
...
@@ -1922,7 +1922,7 @@ typedef struct smb_com_transaction2_get_dfs_refer_req {
/* DFS server target type */
#define DFS_TYPE_LINK 0x0000
/* also for sysvol targets */
#define DFS_TYPE_ROOT 0x0001
/* Referral Entry Flags */
#define DFS_NAME_LIST_REF 0x0200
...
...
fs/cifs/cifssmb.c
浏览文件 @
61e74801
...
...
@@ -1382,13 +1382,13 @@ CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon,
if
(
cpu_to_le32
(
FILE_CREATE
)
==
pSMBr
->
CreateAction
)
*
pOplock
|=
CIFS_CREATE_ACTION
;
if
(
pfile_info
)
{
memcpy
((
char
*
)
pfile_info
,
(
char
*
)
&
pSMBr
->
CreationTime
,
36
/* CreationTime to Attributes */
);
/* the file_info buf is endian converted by caller */
pfile_info
->
AllocationSize
=
pSMBr
->
AllocationSize
;
pfile_info
->
EndOfFile
=
pSMBr
->
EndOfFile
;
pfile_info
->
NumberOfLinks
=
cpu_to_le32
(
1
);
pfile_info
->
DeletePending
=
0
;
memcpy
((
char
*
)
pfile_info
,
(
char
*
)
&
pSMBr
->
CreationTime
,
36
/* CreationTime to Attributes */
);
/* the file_info buf is endian converted by caller */
pfile_info
->
AllocationSize
=
pSMBr
->
AllocationSize
;
pfile_info
->
EndOfFile
=
pSMBr
->
EndOfFile
;
pfile_info
->
NumberOfLinks
=
cpu_to_le32
(
1
);
pfile_info
->
DeletePending
=
0
;
}
}
...
...
@@ -1558,7 +1558,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
pSMB
->
DataOffset
=
cpu_to_le16
(
offsetof
(
struct
smb_com_write_req
,
Data
)
-
4
);
if
(
buf
)
memcpy
(
pSMB
->
Data
,
buf
,
bytes_sent
);
memcpy
(
pSMB
->
Data
,
buf
,
bytes_sent
);
else
if
(
ubuf
)
{
if
(
copy_from_user
(
pSMB
->
Data
,
ubuf
,
bytes_sent
))
{
cifs_buf_release
(
pSMB
);
...
...
fs/cifs/connect.c
浏览文件 @
61e74801
...
...
@@ -2582,7 +2582,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,
__u16
action
=
le16_to_cpu
(
pSMBr
->
resp
.
Action
);
__u16
blob_len
=
le16_to_cpu
(
pSMBr
->
resp
.
SecurityBlobLength
);
if
(
action
&
GUEST_LOGIN
)
cFYI
(
1
,
(
"
Guest login"
));
/* BB mark SesInfo struct? */
cFYI
(
1
,
(
"Guest login"
));
/* BB mark SesInfo struct? */
ses
->
Suid
=
smb_buffer_response
->
Uid
;
/* UID left in wire format
(little endian) */
cFYI
(
1
,
(
"UID = %d "
,
ses
->
Suid
));
...
...
@@ -2728,13 +2728,11 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,
len
));
}
}
else
{
cERROR
(
1
,
(
" Security Blob Length extends beyond "
cERROR
(
1
,
(
"Security Blob Length extends beyond "
"end of SMB"
));
}
}
else
{
cERROR
(
1
,
(
" Invalid Word count %d: "
,
cERROR
(
1
,
(
"Invalid Word count %d: "
,
smb_buffer_response
->
WordCount
));
rc
=
-
EIO
;
}
...
...
@@ -2892,7 +2890,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
__u16
blob_len
=
le16_to_cpu
(
pSMBr
->
resp
.
SecurityBlobLength
);
if
(
action
&
GUEST_LOGIN
)
cFYI
(
1
,
(
"
Guest login"
));
cFYI
(
1
,
(
"Guest login"
));
/* Do we want to set anything in SesInfo struct when guest login? */
bcc_ptr
=
pByteArea
(
smb_buffer_response
);
...
...
@@ -2900,8 +2898,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
SecurityBlob2
=
(
PCHALLENGE_MESSAGE
)
bcc_ptr
;
if
(
SecurityBlob2
->
MessageType
!=
NtLmChallenge
)
{
cFYI
(
1
,
(
"Unexpected NTLMSSP message type received %d"
,
cFYI
(
1
,
(
"Unexpected NTLMSSP message type received %d"
,
SecurityBlob2
->
MessageType
));
}
else
if
(
ses
)
{
ses
->
Suid
=
smb_buffer_response
->
Uid
;
/* UID left in le format */
...
...
@@ -3073,8 +3070,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
cERROR
(
1
,
(
"No session structure passed in."
));
}
}
else
{
cERROR
(
1
,
(
" Invalid Word count %d:"
,
cERROR
(
1
,
(
"Invalid Word count %d:"
,
smb_buffer_response
->
WordCount
));
rc
=
-
EIO
;
}
...
...
@@ -3313,7 +3309,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
__u16
action
=
le16_to_cpu
(
pSMBr
->
resp
.
Action
);
__u16
blob_len
=
le16_to_cpu
(
pSMBr
->
resp
.
SecurityBlobLength
);
if
(
action
&
GUEST_LOGIN
)
cFYI
(
1
,
(
"
Guest login"
));
/* BB Should we set anything
cFYI
(
1
,
(
"Guest login"
));
/* BB Should we set anything
in SesInfo struct ? */
/* if (SecurityBlob2->MessageType != NtLm??) {
cFYI("Unexpected message type on auth response is %d"));
...
...
fs/cifs/dir.c
浏览文件 @
61e74801
...
...
@@ -483,7 +483,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
xid
=
GetXid
();
cFYI
(
1
,
(
"
parent inode = 0x%p name is: %s and dentry = 0x%p"
,
cFYI
(
1
,
(
"parent inode = 0x%p name is: %s and dentry = 0x%p"
,
parent_dir_inode
,
direntry
->
d_name
.
name
,
direntry
));
/* check whether path exists */
...
...
@@ -515,12 +515,11 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
}
if
(
direntry
->
d_inode
!=
NULL
)
{
cFYI
(
1
,
(
"
non-NULL inode in lookup"
));
cFYI
(
1
,
(
"non-NULL inode in lookup"
));
}
else
{
cFYI
(
1
,
(
"
NULL inode in lookup"
));
cFYI
(
1
,
(
"NULL inode in lookup"
));
}
cFYI
(
1
,
(
" Full path: %s inode = 0x%p"
,
full_path
,
direntry
->
d_inode
));
cFYI
(
1
,
(
"Full path: %s inode = 0x%p"
,
full_path
,
direntry
->
d_inode
));
if
(
pTcon
->
unix_ext
)
rc
=
cifs_get_inode_info_unix
(
&
newInode
,
full_path
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录