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
Kirill Smelkov
linux
Commits
09c92cb8
Commit
09c92cb8
authored
Sep 01, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
b022adc6
fa6ee3dd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
fs/cifs/cifsfs.c
fs/cifs/cifsfs.c
+1
-1
fs/cifs/link.c
fs/cifs/link.c
+3
-3
No files found.
fs/cifs/cifsfs.c
View file @
09c92cb8
...
@@ -512,7 +512,7 @@ struct inode_operations cifs_file_inode_ops = {
...
@@ -512,7 +512,7 @@ struct inode_operations cifs_file_inode_ops = {
};
};
struct
inode_operations
cifs_symlink_inode_ops
=
{
struct
inode_operations
cifs_symlink_inode_ops
=
{
.
readlink
=
cifs_readlink
,
.
readlink
=
generic_readlink
,
.
follow_link
=
cifs_follow_link
,
.
follow_link
=
cifs_follow_link
,
.
put_link
=
cifs_put_link
,
.
put_link
=
cifs_put_link
,
.
permission
=
cifs_permission
,
.
permission
=
cifs_permission
,
...
...
fs/cifs/link.c
View file @
09c92cb8
...
@@ -106,7 +106,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
...
@@ -106,7 +106,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
up
(
&
direntry
->
d_sb
->
s_vfs_rename_sem
);
up
(
&
direntry
->
d_sb
->
s_vfs_rename_sem
);
if
(
!
full_path
)
if
(
!
full_path
)
goto
out
;
goto
out
_no_free
;
cFYI
(
1
,
(
"Full path: %s inode = 0x%p"
,
full_path
,
inode
));
cFYI
(
1
,
(
"Full path: %s inode = 0x%p"
,
full_path
,
inode
));
cifs_sb
=
CIFS_SB
(
inode
->
i_sb
);
cifs_sb
=
CIFS_SB
(
inode
->
i_sb
);
...
@@ -126,9 +126,8 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
...
@@ -126,9 +126,8 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
else
{
else
{
/* rc = CIFSSMBQueryReparseLinkInfo */
/* rc = CIFSSMBQueryReparseLinkInfo */
/* BB Add code to Query ReparsePoint info */
/* BB Add code to Query ReparsePoint info */
/* BB Add MAC style xsymlink check here if enabled */
}
}
/* BB Anything else to do to handle recursive links? */
/* BB Should we be using page symlink ops here? */
if
(
rc
==
0
)
{
if
(
rc
==
0
)
{
...
@@ -142,6 +141,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
...
@@ -142,6 +141,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
out:
out:
kfree
(
full_path
);
kfree
(
full_path
);
out_no_free:
FreeXid
(
xid
);
FreeXid
(
xid
);
nd_set_link
(
nd
,
target_path
);
nd_set_link
(
nd
,
target_path
);
return
0
;
return
0
;
...
...
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