Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
6dc0f87e
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6dc0f87e
编写于
7月 06, 2007
作者:
S
Steve French
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[CIFS] whitespace cleanup
Signed-off-by:
N
Steve French
<
sfrench@us.ibm.com
>
上级
79a58d1f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
48 addition
and
46 deletion
+48
-46
fs/cifs/cifsfs.c
fs/cifs/cifsfs.c
+32
-31
fs/cifs/nterr.c
fs/cifs/nterr.c
+4
-4
fs/cifs/nterr.h
fs/cifs/nterr.h
+1
-1
fs/cifs/ntlmssp.h
fs/cifs/ntlmssp.h
+1
-1
fs/cifs/readdir.c
fs/cifs/readdir.c
+9
-8
fs/cifs/smberr.h
fs/cifs/smberr.h
+1
-1
未找到文件。
fs/cifs/cifsfs.c
浏览文件 @
6dc0f87e
...
...
@@ -64,10 +64,10 @@ unsigned int multiuser_mount = 0;
unsigned
int
extended_security
=
CIFSSEC_DEF
;
/* unsigned int ntlmv2_support = 0; */
unsigned
int
sign_CIFS_PDUs
=
1
;
extern
struct
task_struct
*
oplockThread
;
/* remove sparse warning */
struct
task_struct
*
oplockThread
=
NULL
;
extern
struct
task_struct
*
oplockThread
;
/* remove sparse warning */
struct
task_struct
*
oplockThread
=
NULL
;
/* extern struct task_struct * dnotifyThread; remove sparse warning */
static
struct
task_struct
*
dnotifyThread
=
NULL
;
static
struct
task_struct
*
dnotifyThread
=
NULL
;
static
const
struct
super_operations
cifs_super_ops
;
unsigned
int
CIFSMaxBufSize
=
CIFS_MAX_MSGSIZE
;
module_param
(
CIFSMaxBufSize
,
int
,
0
);
...
...
@@ -765,22 +765,22 @@ cifs_init_request_bufs(void)
been more efficient (compacting multiple slab items on one 4k page)
for the case in which debug was on, but this larger size allows
more SMBs to use small buffer alloc and is still much more
efficient to alloc 1 per page off the slab compared to 17K (5page)
efficient to alloc 1 per page off the slab compared to 17K (5page)
alloc of large cifs buffers even when page debugging is on */
cifs_sm_req_cachep
=
kmem_cache_create
(
"cifs_small_rq"
,
MAX_CIFS_SMALL_BUFFER_SIZE
,
0
,
SLAB_HWCACHE_ALIGN
,
MAX_CIFS_SMALL_BUFFER_SIZE
,
0
,
SLAB_HWCACHE_ALIGN
,
NULL
,
NULL
);
if
(
cifs_sm_req_cachep
==
NULL
)
{
mempool_destroy
(
cifs_req_poolp
);
kmem_cache_destroy
(
cifs_req_cachep
);
return
-
ENOMEM
;
return
-
ENOMEM
;
}
if
(
cifs_min_small
<
2
)
cifs_min_small
=
2
;
else
if
(
cifs_min_small
>
256
)
{
cifs_min_small
=
256
;
cFYI
(
1
,(
"cifs_min_small set to maximum (256)"
));
cFYI
(
1
,
(
"cifs_min_small set to maximum (256)"
));
}
cifs_sm_req_poolp
=
mempool_create_slab_pool
(
cifs_min_small
,
...
...
@@ -843,14 +843,14 @@ cifs_destroy_mids(void)
static
int
cifs_oplock_thread
(
void
*
dummyarg
)
{
struct
oplock_q_entry
*
oplock_item
;
struct
oplock_q_entry
*
oplock_item
;
struct
cifsTconInfo
*
pTcon
;
struct
inode
*
inode
;
struct
inode
*
inode
;
__u16
netfid
;
int
rc
;
do
{
if
(
try_to_freeze
())
if
(
try_to_freeze
())
continue
;
spin_lock
(
&
GlobalMid_Lock
);
...
...
@@ -859,17 +859,17 @@ static int cifs_oplock_thread(void * dummyarg)
set_current_state
(
TASK_INTERRUPTIBLE
);
schedule_timeout
(
39
*
HZ
);
}
else
{
oplock_item
=
list_entry
(
GlobalOplock_Q
.
next
,
oplock_item
=
list_entry
(
GlobalOplock_Q
.
next
,
struct
oplock_q_entry
,
qhead
);
if
(
oplock_item
)
{
cFYI
(
1
,(
"found oplock item to write out"
));
cFYI
(
1
,(
"found oplock item to write out"
));
pTcon
=
oplock_item
->
tcon
;
inode
=
oplock_item
->
pinode
;
netfid
=
oplock_item
->
netfid
;
spin_unlock
(
&
GlobalMid_Lock
);
DeleteOplockQEntry
(
oplock_item
);
/* can not grab inode sem here since it would
deadlock when oplock received on delete
deadlock when oplock received on delete
since vfs_unlink holds the i_mutex across
the call */
/* mutex_lock(&inode->i_mutex);*/
...
...
@@ -884,20 +884,21 @@ static int cifs_oplock_thread(void * dummyarg)
/* mutex_unlock(&inode->i_mutex);*/
if
(
rc
)
CIFS_I
(
inode
)
->
write_behind_rc
=
rc
;
cFYI
(
1
,(
"Oplock flush inode %p rc %d"
,
inode
,
rc
));
/* releasing a stale oplock after recent reconnection
of smb session using a now incorrect file
handle is not a data integrity issue but do
not bother sending an oplock release if session
to server still is disconnected since oplock
cFYI
(
1
,
(
"Oplock flush inode %p rc %d"
,
inode
,
rc
));
/* releasing stale oplock after recent reconnect
of smb session using a now incorrect file
handle is not a data integrity issue but do
not bother sending an oplock release if session
to server still is disconnected since oplock
already released by the server in that case */
if
(
pTcon
->
tidStatus
!=
CifsNeedReconnect
)
{
rc
=
CIFSSMBLock
(
0
,
pTcon
,
netfid
,
0
/* len */
,
0
/* offset */
,
0
,
0
/* len */
,
0
/* offset */
,
0
,
0
,
LOCKING_ANDX_OPLOCK_RELEASE
,
0
/* wait flag */
);
cFYI
(
1
,(
"Oplock release rc = %d "
,
rc
));
cFYI
(
1
,(
"Oplock release rc = %d "
,
rc
));
}
}
else
spin_unlock
(
&
GlobalMid_Lock
);
...
...
@@ -924,9 +925,9 @@ static int cifs_dnotify_thread(void * dummyarg)
to be woken up and wakeq so the
thread can wake up and error out */
list_for_each
(
tmp
,
&
GlobalSMBSessionList
)
{
ses
=
list_entry
(
tmp
,
struct
cifsSesInfo
,
ses
=
list_entry
(
tmp
,
struct
cifsSesInfo
,
cifsSessionList
);
if
(
ses
&&
ses
->
server
&&
if
(
ses
&&
ses
->
server
&&
atomic_read
(
&
ses
->
server
->
inFlight
))
wake_up_all
(
&
ses
->
server
->
response_q
);
}
...
...
@@ -950,13 +951,13 @@ init_cifs(void)
#ifdef CONFIG_CIFS_EXPERIMENTAL
INIT_LIST_HEAD
(
&
GlobalDnotifyReqList
);
INIT_LIST_HEAD
(
&
GlobalDnotifyRsp_Q
);
#endif
#endif
/*
* Initialize Global counters
*/
atomic_set
(
&
sesInfoAllocCount
,
0
);
atomic_set
(
&
tconInfoAllocCount
,
0
);
atomic_set
(
&
tcpSesAllocCount
,
0
);
atomic_set
(
&
tcpSesAllocCount
,
0
);
atomic_set
(
&
tcpSesReconnectCount
,
0
);
atomic_set
(
&
tconInfoReconnectCount
,
0
);
...
...
@@ -977,10 +978,10 @@ init_cifs(void)
if
(
cifs_max_pending
<
2
)
{
cifs_max_pending
=
2
;
cFYI
(
1
,(
"cifs_max_pending set to min of 2"
));
cFYI
(
1
,
(
"cifs_max_pending set to min of 2"
));
}
else
if
(
cifs_max_pending
>
256
)
{
cifs_max_pending
=
256
;
cFYI
(
1
,(
"cifs_max_pending set to max of 256"
));
cFYI
(
1
,
(
"cifs_max_pending set to max of 256"
));
}
rc
=
cifs_init_inodecache
();
...
...
@@ -1002,14 +1003,14 @@ init_cifs(void)
oplockThread
=
kthread_run
(
cifs_oplock_thread
,
NULL
,
"cifsoplockd"
);
if
(
IS_ERR
(
oplockThread
))
{
rc
=
PTR_ERR
(
oplockThread
);
cERROR
(
1
,(
"error %d create oplock thread"
,
rc
));
cERROR
(
1
,
(
"error %d create oplock thread"
,
rc
));
goto
out_unregister_filesystem
;
}
dnotifyThread
=
kthread_run
(
cifs_dnotify_thread
,
NULL
,
"cifsdnotifyd"
);
if
(
IS_ERR
(
dnotifyThread
))
{
rc
=
PTR_ERR
(
dnotifyThread
);
cERROR
(
1
,(
"error %d create dnotify thread"
,
rc
));
cERROR
(
1
,
(
"error %d create dnotify thread"
,
rc
));
goto
out_stop_oplock_thread
;
}
...
...
@@ -1048,7 +1049,7 @@ exit_cifs(void)
}
MODULE_AUTHOR
(
"Steve French <sfrench@us.ibm.com>"
);
MODULE_LICENSE
(
"GPL"
);
/* combination of LGPL + GPL source behaves as GPL */
MODULE_LICENSE
(
"GPL"
);
/* combination of LGPL + GPL source behaves as GPL */
MODULE_DESCRIPTION
(
"VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows"
);
MODULE_VERSION
(
CIFS_VERSION
);
...
...
fs/cifs/nterr.c
浏览文件 @
6dc0f87e
/*
/*
* Unix SMB/Netbios implementation.
* Version 1.9.
* RPC Pipe client / server routines
* Copyright (C) Luke Kenneth Casson Leighton 1997-2001.
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
...
...
fs/cifs/nterr.h
浏览文件 @
6dc0f87e
/*
/*
Unix SMB/Netbios implementation.
Version 1.9.
NT error code constants
...
...
fs/cifs/ntlmssp.h
浏览文件 @
6dc0f87e
...
...
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define NTLMSSP_SIGNATURE "NTLMSSP"
...
...
fs/cifs/readdir.c
浏览文件 @
6dc0f87e
...
...
@@ -2,7 +2,7 @@
* fs/cifs/readdir.c
*
* Directory search handling
*
*
* Copyright (C) International Business Machines Corp., 2004, 2007
* Author(s): Steve French (sfrench@us.ibm.com)
*
...
...
@@ -34,22 +34,22 @@
#ifdef CONFIG_CIFS_DEBUG2
static
void
dump_cifs_file_struct
(
struct
file
*
file
,
char
*
label
)
{
struct
cifsFileInfo
*
cf
;
struct
cifsFileInfo
*
cf
;
if
(
file
)
{
cf
=
file
->
private_data
;
if
(
cf
==
NULL
)
{
cFYI
(
1
,(
"empty cifs private file data"
));
cFYI
(
1
,
(
"empty cifs private file data"
));
return
;
}
if
(
cf
->
invalidHandle
)
{
cFYI
(
1
,(
"invalid handle"
));
cFYI
(
1
,
(
"invalid handle"
));
}
if
(
cf
->
srch_inf
.
endOfSearch
)
{
cFYI
(
1
,(
"end of search"
));
cFYI
(
1
,
(
"end of search"
));
}
if
(
cf
->
srch_inf
.
emptyDir
)
{
cFYI
(
1
,(
"empty dir"
));
cFYI
(
1
,
(
"empty dir"
));
}
}
...
...
@@ -73,7 +73,8 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
qstring
->
hash
=
full_name_hash
(
qstring
->
name
,
qstring
->
len
);
tmp_dentry
=
d_lookup
(
file
->
f_path
.
dentry
,
qstring
);
if
(
tmp_dentry
)
{
cFYI
(
0
,
(
"existing dentry with inode 0x%p"
,
tmp_dentry
->
d_inode
));
cFYI
(
0
,
(
"existing dentry with inode 0x%p"
,
tmp_dentry
->
d_inode
));
*
ptmp_inode
=
tmp_dentry
->
d_inode
;
/* BB overwrite old name? i.e. tmp_dentry->d_name and tmp_dentry->d_name.len??*/
if
(
*
ptmp_inode
==
NULL
)
{
...
...
@@ -87,7 +88,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
}
else
{
tmp_dentry
=
d_alloc
(
file
->
f_path
.
dentry
,
qstring
);
if
(
tmp_dentry
==
NULL
)
{
cERROR
(
1
,(
"Failed allocating dentry"
));
cERROR
(
1
,
(
"Failed allocating dentry"
));
*
ptmp_inode
=
NULL
;
return
rc
;
}
...
...
fs/cifs/smberr.h
浏览文件 @
6dc0f87e
...
...
@@ -110,7 +110,7 @@
/* Below errors are used internally (do not come over the wire) for passthrough
from STATUS codes to POSIX only */
#define ErrTooManyLinks 0xFFFE
#define ErrTooManyLinks 0xFFFE
/* Following error codes may be generated with the ERRSRV error class.*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录