Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
d82c2df5
Commit
d82c2df5
authored
Nov 15, 2008
by
Steve French
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CIFS] minor cleanup to cifs_mount
Signed-off-by:
Steve French
<
sfrench@us.ibm.com
>
parent
14fbf50d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
40 deletions
+34
-40
fs/cifs/connect.c
fs/cifs/connect.c
+34
-40
No files found.
fs/cifs/connect.c
View file @
d82c2df5
...
...
@@ -1368,7 +1368,6 @@ cifs_find_tcp_session(struct sockaddr *addr)
list_for_each
(
tmp
,
&
cifs_tcp_ses_list
)
{
server
=
list_entry
(
tmp
,
struct
TCP_Server_Info
,
tcp_ses_list
);
/*
* the demux thread can exit on its own while still in CifsNew
* so don't accept any sockets in that state. Since the
...
...
@@ -1389,6 +1388,7 @@ cifs_find_tcp_session(struct sockaddr *addr)
++
server
->
srv_count
;
write_unlock
(
&
cifs_tcp_ses_lock
);
cFYI
(
1
,
(
"Existing tcp session with server found"
));
return
server
;
}
write_unlock
(
&
cifs_tcp_ses_lock
);
...
...
@@ -2076,9 +2076,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
}
srvTcp
=
cifs_find_tcp_session
(
&
addr
);
if
(
srvTcp
)
{
cFYI
(
1
,
(
"Existing tcp session with server found"
));
}
else
{
/* create socket */
if
(
!
srvTcp
)
{
/* create socket */
if
(
addr
.
sa_family
==
AF_INET6
)
{
cFYI
(
1
,
(
"attempting ipv6 connect"
));
/* BB should we allow ipv6 on port 139? */
...
...
@@ -2292,7 +2290,8 @@ mount_fail_check:
cifs_put_smb_ses
(
pSesInfo
);
else
cifs_put_tcp_session
(
srvTcp
);
}
else
{
goto
out
;
}
atomic_inc
(
&
tcon
->
useCount
);
cifs_sb
->
tcon
=
tcon
;
tcon
->
ses
=
pSesInfo
;
...
...
@@ -2313,23 +2312,18 @@ mount_fail_check:
/* convert forward to back slashes in prepath here if needed */
if
((
cifs_sb
->
mnt_cifs_flags
&
CIFS_MOUNT_POSIX_PATHS
)
==
0
)
convert_delimiter
(
cifs_sb
->
prepath
,
CIFS_DIR_SEP
(
cifs_sb
));
convert_delimiter
(
cifs_sb
->
prepath
,
CIFS_DIR_SEP
(
cifs_sb
));
if
((
tcon
->
unix_ext
==
0
)
&&
(
cifs_sb
->
rsize
>
(
1024
*
127
)))
{
cifs_sb
->
rsize
=
1024
*
127
;
cFYI
(
DBG2
,
(
"no very large read support, rsize now 127K"
));
cFYI
(
DBG2
,
(
"no very large read support, rsize now 127K"
));
}
if
(
!
(
tcon
->
ses
->
capabilities
&
CAP_LARGE_WRITE_X
))
cifs_sb
->
wsize
=
min
(
cifs_sb
->
wsize
,
(
tcon
->
ses
->
server
->
maxBuf
-
MAX_CIFS_HDR_SIZE
));
(
tcon
->
ses
->
server
->
maxBuf
-
MAX_CIFS_HDR_SIZE
));
if
(
!
(
tcon
->
ses
->
capabilities
&
CAP_LARGE_READ_X
))
cifs_sb
->
rsize
=
min
(
cifs_sb
->
rsize
,
(
tcon
->
ses
->
server
->
maxBuf
-
MAX_CIFS_HDR_SIZE
));
}
(
tcon
->
ses
->
server
->
maxBuf
-
MAX_CIFS_HDR_SIZE
));
/* volume_info.password is freed above when existing session found
(in which case it is not needed anymore) but when new sesion is created
...
...
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