Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
6dc0f87e
Commit
6dc0f87e
authored
Jul 06, 2007
by
Steve French
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CIFS] whitespace cleanup
Signed-off-by:
Steve French
<
sfrench@us.ibm.com
>
parent
79a58d1f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
45 deletions
+47
-45
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
No files found.
fs/cifs/cifsfs.c
View file @
6dc0f87e
...
@@ -64,10 +64,10 @@ unsigned int multiuser_mount = 0;
...
@@ -64,10 +64,10 @@ unsigned int multiuser_mount = 0;
unsigned
int
extended_security
=
CIFSSEC_DEF
;
unsigned
int
extended_security
=
CIFSSEC_DEF
;
/* unsigned int ntlmv2_support = 0; */
/* unsigned int ntlmv2_support = 0; */
unsigned
int
sign_CIFS_PDUs
=
1
;
unsigned
int
sign_CIFS_PDUs
=
1
;
extern
struct
task_struct
*
oplockThread
;
/* remove sparse warning */
extern
struct
task_struct
*
oplockThread
;
/* remove sparse warning */
struct
task_struct
*
oplockThread
=
NULL
;
struct
task_struct
*
oplockThread
=
NULL
;
/* extern struct task_struct * dnotifyThread; remove sparse warning */
/* 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
;
static
const
struct
super_operations
cifs_super_ops
;
unsigned
int
CIFSMaxBufSize
=
CIFS_MAX_MSGSIZE
;
unsigned
int
CIFSMaxBufSize
=
CIFS_MAX_MSGSIZE
;
module_param
(
CIFSMaxBufSize
,
int
,
0
);
module_param
(
CIFSMaxBufSize
,
int
,
0
);
...
@@ -780,7 +780,7 @@ cifs_init_request_bufs(void)
...
@@ -780,7 +780,7 @@ cifs_init_request_bufs(void)
cifs_min_small
=
2
;
cifs_min_small
=
2
;
else
if
(
cifs_min_small
>
256
)
{
else
if
(
cifs_min_small
>
256
)
{
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
,
cifs_sm_req_poolp
=
mempool_create_slab_pool
(
cifs_min_small
,
...
@@ -843,9 +843,9 @@ cifs_destroy_mids(void)
...
@@ -843,9 +843,9 @@ cifs_destroy_mids(void)
static
int
cifs_oplock_thread
(
void
*
dummyarg
)
static
int
cifs_oplock_thread
(
void
*
dummyarg
)
{
{
struct
oplock_q_entry
*
oplock_item
;
struct
oplock_q_entry
*
oplock_item
;
struct
cifsTconInfo
*
pTcon
;
struct
cifsTconInfo
*
pTcon
;
struct
inode
*
inode
;
struct
inode
*
inode
;
__u16
netfid
;
__u16
netfid
;
int
rc
;
int
rc
;
...
@@ -884,9 +884,10 @@ static int cifs_oplock_thread(void * dummyarg)
...
@@ -884,9 +884,10 @@ static int cifs_oplock_thread(void * dummyarg)
/* mutex_unlock(&inode->i_mutex);*/
/* mutex_unlock(&inode->i_mutex);*/
if
(
rc
)
if
(
rc
)
CIFS_I
(
inode
)
->
write_behind_rc
=
rc
;
CIFS_I
(
inode
)
->
write_behind_rc
=
rc
;
cFYI
(
1
,(
"Oplock flush inode %p rc %d"
,
inode
,
rc
));
cFYI
(
1
,
(
"Oplock flush inode %p rc %d"
,
inode
,
rc
));
/* releasing
a stale oplock after recent reconnection
/* releasing
stale oplock after recent reconnect
of smb session using a now incorrect file
of smb session using a now incorrect file
handle is not a data integrity issue but do
handle is not a data integrity issue but do
not bother sending an oplock release if session
not bother sending an oplock release if session
...
@@ -897,7 +898,7 @@ static int cifs_oplock_thread(void * dummyarg)
...
@@ -897,7 +898,7 @@ static int cifs_oplock_thread(void * dummyarg)
0
/* len */
,
0
/* offset */
,
0
,
0
/* len */
,
0
/* offset */
,
0
,
0
,
LOCKING_ANDX_OPLOCK_RELEASE
,
0
,
LOCKING_ANDX_OPLOCK_RELEASE
,
0
/* wait flag */
);
0
/* wait flag */
);
cFYI
(
1
,(
"Oplock release rc = %d "
,
rc
));
cFYI
(
1
,(
"Oplock release rc = %d "
,
rc
));
}
}
}
else
}
else
spin_unlock
(
&
GlobalMid_Lock
);
spin_unlock
(
&
GlobalMid_Lock
);
...
@@ -956,7 +957,7 @@ init_cifs(void)
...
@@ -956,7 +957,7 @@ init_cifs(void)
*/
*/
atomic_set
(
&
sesInfoAllocCount
,
0
);
atomic_set
(
&
sesInfoAllocCount
,
0
);
atomic_set
(
&
tconInfoAllocCount
,
0
);
atomic_set
(
&
tconInfoAllocCount
,
0
);
atomic_set
(
&
tcpSesAllocCount
,
0
);
atomic_set
(
&
tcpSesAllocCount
,
0
);
atomic_set
(
&
tcpSesReconnectCount
,
0
);
atomic_set
(
&
tcpSesReconnectCount
,
0
);
atomic_set
(
&
tconInfoReconnectCount
,
0
);
atomic_set
(
&
tconInfoReconnectCount
,
0
);
...
@@ -977,10 +978,10 @@ init_cifs(void)
...
@@ -977,10 +978,10 @@ init_cifs(void)
if
(
cifs_max_pending
<
2
)
{
if
(
cifs_max_pending
<
2
)
{
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
)
{
}
else
if
(
cifs_max_pending
>
256
)
{
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
();
rc
=
cifs_init_inodecache
();
...
@@ -1002,14 +1003,14 @@ init_cifs(void)
...
@@ -1002,14 +1003,14 @@ init_cifs(void)
oplockThread
=
kthread_run
(
cifs_oplock_thread
,
NULL
,
"cifsoplockd"
);
oplockThread
=
kthread_run
(
cifs_oplock_thread
,
NULL
,
"cifsoplockd"
);
if
(
IS_ERR
(
oplockThread
))
{
if
(
IS_ERR
(
oplockThread
))
{
rc
=
PTR_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
;
goto
out_unregister_filesystem
;
}
}
dnotifyThread
=
kthread_run
(
cifs_dnotify_thread
,
NULL
,
"cifsdnotifyd"
);
dnotifyThread
=
kthread_run
(
cifs_dnotify_thread
,
NULL
,
"cifsdnotifyd"
);
if
(
IS_ERR
(
dnotifyThread
))
{
if
(
IS_ERR
(
dnotifyThread
))
{
rc
=
PTR_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
;
goto
out_stop_oplock_thread
;
}
}
...
...
fs/cifs/nterr.c
View file @
6dc0f87e
fs/cifs/nterr.h
View file @
6dc0f87e
fs/cifs/ntlmssp.h
View file @
6dc0f87e
fs/cifs/readdir.c
View file @
6dc0f87e
...
@@ -34,22 +34,22 @@
...
@@ -34,22 +34,22 @@
#ifdef CONFIG_CIFS_DEBUG2
#ifdef CONFIG_CIFS_DEBUG2
static
void
dump_cifs_file_struct
(
struct
file
*
file
,
char
*
label
)
static
void
dump_cifs_file_struct
(
struct
file
*
file
,
char
*
label
)
{
{
struct
cifsFileInfo
*
cf
;
struct
cifsFileInfo
*
cf
;
if
(
file
)
{
if
(
file
)
{
cf
=
file
->
private_data
;
cf
=
file
->
private_data
;
if
(
cf
==
NULL
)
{
if
(
cf
==
NULL
)
{
cFYI
(
1
,(
"empty cifs private file data"
));
cFYI
(
1
,
(
"empty cifs private file data"
));
return
;
return
;
}
}
if
(
cf
->
invalidHandle
)
{
if
(
cf
->
invalidHandle
)
{
cFYI
(
1
,(
"invalid handle"
));
cFYI
(
1
,
(
"invalid handle"
));
}
}
if
(
cf
->
srch_inf
.
endOfSearch
)
{
if
(
cf
->
srch_inf
.
endOfSearch
)
{
cFYI
(
1
,(
"end of search"
));
cFYI
(
1
,
(
"end of search"
));
}
}
if
(
cf
->
srch_inf
.
emptyDir
)
{
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,
...
@@ -73,7 +73,8 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
qstring
->
hash
=
full_name_hash
(
qstring
->
name
,
qstring
->
len
);
qstring
->
hash
=
full_name_hash
(
qstring
->
name
,
qstring
->
len
);
tmp_dentry
=
d_lookup
(
file
->
f_path
.
dentry
,
qstring
);
tmp_dentry
=
d_lookup
(
file
->
f_path
.
dentry
,
qstring
);
if
(
tmp_dentry
)
{
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
;
*
ptmp_inode
=
tmp_dentry
->
d_inode
;
/* BB overwrite old name? i.e. tmp_dentry->d_name and tmp_dentry->d_name.len??*/
/* BB overwrite old name? i.e. tmp_dentry->d_name and tmp_dentry->d_name.len??*/
if
(
*
ptmp_inode
==
NULL
)
{
if
(
*
ptmp_inode
==
NULL
)
{
...
@@ -87,7 +88,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
...
@@ -87,7 +88,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
}
else
{
}
else
{
tmp_dentry
=
d_alloc
(
file
->
f_path
.
dentry
,
qstring
);
tmp_dentry
=
d_alloc
(
file
->
f_path
.
dentry
,
qstring
);
if
(
tmp_dentry
==
NULL
)
{
if
(
tmp_dentry
==
NULL
)
{
cERROR
(
1
,(
"Failed allocating dentry"
));
cERROR
(
1
,
(
"Failed allocating dentry"
));
*
ptmp_inode
=
NULL
;
*
ptmp_inode
=
NULL
;
return
rc
;
return
rc
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment