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
9fbb76ce
Commit
9fbb76ce
authored
Oct 12, 2008
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] get rid of on-stack dentry in udf
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
ad76cbc6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
15 deletions
+11
-15
fs/udf/namei.c
fs/udf/namei.c
+11
-15
No files found.
fs/udf/namei.c
View file @
9fbb76ce
...
...
@@ -142,7 +142,7 @@ int udf_write_fi(struct inode *inode, struct fileIdentDesc *cfi,
}
static
struct
fileIdentDesc
*
udf_find_entry
(
struct
inode
*
dir
,
struct
dentry
*
dentry
,
struct
qstr
*
child
,
struct
udf_fileident_bh
*
fibh
,
struct
fileIdentDesc
*
cfi
)
{
...
...
@@ -159,8 +159,8 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir,
sector_t
offset
;
struct
extent_position
epos
=
{};
struct
udf_inode_info
*
dinfo
=
UDF_I
(
dir
);
int
isdotdot
=
dentry
->
d_name
.
len
==
2
&&
dentry
->
d_name
.
name
[
0
]
==
'.'
&&
dentry
->
d_name
.
name
[
1
]
==
'.'
;
int
isdotdot
=
child
->
len
==
2
&&
child
->
name
[
0
]
==
'.'
&&
child
->
name
[
1
]
==
'.'
;
size
=
udf_ext0_offset
(
dir
)
+
dir
->
i_size
;
f_pos
=
udf_ext0_offset
(
dir
);
...
...
@@ -238,8 +238,7 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir,
continue
;
flen
=
udf_get_filename
(
dir
->
i_sb
,
nameptr
,
fname
,
lfi
);
if
(
flen
&&
udf_match
(
flen
,
fname
,
dentry
->
d_name
.
len
,
dentry
->
d_name
.
name
))
if
(
flen
&&
udf_match
(
flen
,
fname
,
child
->
len
,
child
->
name
))
goto
out_ok
;
}
...
...
@@ -283,7 +282,7 @@ static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry,
}
else
#endif
/* UDF_RECOVERY */
if
(
udf_find_entry
(
dir
,
dentry
,
&
fibh
,
&
cfi
))
{
if
(
udf_find_entry
(
dir
,
&
dentry
->
d_name
,
&
fibh
,
&
cfi
))
{
if
(
fibh
.
sbh
!=
fibh
.
ebh
)
brelse
(
fibh
.
ebh
);
brelse
(
fibh
.
sbh
);
...
...
@@ -783,7 +782,7 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry)
retval
=
-
ENOENT
;
lock_kernel
();
fi
=
udf_find_entry
(
dir
,
dentry
,
&
fibh
,
&
cfi
);
fi
=
udf_find_entry
(
dir
,
&
dentry
->
d_name
,
&
fibh
,
&
cfi
);
if
(
!
fi
)
goto
out
;
...
...
@@ -829,7 +828,7 @@ static int udf_unlink(struct inode *dir, struct dentry *dentry)
retval
=
-
ENOENT
;
lock_kernel
();
fi
=
udf_find_entry
(
dir
,
dentry
,
&
fibh
,
&
cfi
);
fi
=
udf_find_entry
(
dir
,
&
dentry
->
d_name
,
&
fibh
,
&
cfi
);
if
(
!
fi
)
goto
out
;
...
...
@@ -1113,7 +1112,7 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry,
struct
udf_inode_info
*
old_iinfo
=
UDF_I
(
old_inode
);
lock_kernel
();
ofi
=
udf_find_entry
(
old_dir
,
old_dentry
,
&
ofibh
,
&
ocfi
);
ofi
=
udf_find_entry
(
old_dir
,
&
old_dentry
->
d_name
,
&
ofibh
,
&
ocfi
);
if
(
ofi
)
{
if
(
ofibh
.
sbh
!=
ofibh
.
ebh
)
brelse
(
ofibh
.
ebh
);
...
...
@@ -1124,7 +1123,7 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry,
!=
old_inode
->
i_ino
)
goto
end_rename
;
nfi
=
udf_find_entry
(
new_dir
,
new_dentry
,
&
nfibh
,
&
ncfi
);
nfi
=
udf_find_entry
(
new_dir
,
&
new_dentry
->
d_name
,
&
nfibh
,
&
ncfi
);
if
(
nfi
)
{
if
(
!
new_inode
)
{
if
(
nfibh
.
sbh
!=
nfibh
.
ebh
)
...
...
@@ -1192,7 +1191,7 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry,
udf_write_fi
(
new_dir
,
&
ncfi
,
nfi
,
&
nfibh
,
NULL
,
NULL
);
/* The old fid may have moved - find it again */
ofi
=
udf_find_entry
(
old_dir
,
old_dentry
,
&
ofibh
,
&
ocfi
);
ofi
=
udf_find_entry
(
old_dir
,
&
old_dentry
->
d_name
,
&
ofibh
,
&
ocfi
);
udf_delete_entry
(
old_dir
,
ofi
,
&
ofibh
,
&
ocfi
);
if
(
new_inode
)
{
...
...
@@ -1244,13 +1243,10 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry,
static
struct
dentry
*
udf_get_parent
(
struct
dentry
*
child
)
{
struct
inode
*
inode
=
NULL
;
struct
dentry
dotdot
;
struct
qstr
dotdot
=
{.
name
=
".."
,
.
len
=
2
}
;
struct
fileIdentDesc
cfi
;
struct
udf_fileident_bh
fibh
;
dotdot
.
d_name
.
name
=
".."
;
dotdot
.
d_name
.
len
=
2
;
lock_kernel
();
if
(
!
udf_find_entry
(
child
->
d_inode
,
&
dotdot
,
&
fibh
,
&
cfi
))
goto
out_unlock
;
...
...
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