adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] get rid of on-stack dentry in ext2_get_parent()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2008-08-24 07:28:39 -04:00
parent 734711abac
commit a9885444f7
3 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs/ext2/dir.c
View file

@ -354,11 +354,11 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
* (as a parameter - res_dir). Page is returned mapped and unlocked. * (as a parameter - res_dir). Page is returned mapped and unlocked.
* Entry is guaranteed to be valid. * Entry is guaranteed to be valid.
*/ */
struct ext2_dir_entry_2 * ext2_find_entry (struct inode * dir, struct ext2_dir_entry_2 *ext2_find_entry (struct inode * dir,
struct dentry *dentry, struct page ** res_page) struct qstr *child, struct page ** res_page)
{ {
const char *name = dentry->d_name.name; const char *name = child->name;
int namelen = dentry->d_name.len; int namelen = child->len;
unsigned reclen = EXT2_DIR_REC_LEN(namelen); unsigned reclen = EXT2_DIR_REC_LEN(namelen);
unsigned long start, n; unsigned long start, n;
unsigned long npages = dir_pages(dir); unsigned long npages = dir_pages(dir);
@ -431,13 +431,13 @@ struct ext2_dir_entry_2 * ext2_dotdot (struct inode *dir, struct page **p)
return de; return de;
} }
ino_t ext2_inode_by_name(struct inode * dir, struct dentry *dentry) ino_t ext2_inode_by_name(struct inode *dir, struct qstr *child)
{ {
ino_t res = 0; ino_t res = 0;
struct ext2_dir_entry_2 * de; struct ext2_dir_entry_2 *de;
struct page *page; struct page *page;
de = ext2_find_entry (dir, dentry, &page); de = ext2_find_entry (dir, child, &page);
if (de) { if (de) {
res = le32_to_cpu(de->inode); res = le32_to_cpu(de->inode);
ext2_put_page(page); ext2_put_page(page);

4
fs/ext2/ext2.h
View file

@ -105,9 +105,9 @@ extern void ext2_rsv_window_add(struct super_block *sb, struct ext2_reserve_wind
/* dir.c */ /* dir.c */
extern int ext2_add_link (struct dentry *, struct inode *); extern int ext2_add_link (struct dentry *, struct inode *);
extern ino_t ext2_inode_by_name(struct inode *, struct dentry *); extern ino_t ext2_inode_by_name(struct inode *, struct qstr *);
extern int ext2_make_empty(struct inode *, struct inode *); extern int ext2_make_empty(struct inode *, struct inode *);
extern struct ext2_dir_entry_2 * ext2_find_entry (struct inode *,struct dentry *, struct page **); extern struct ext2_dir_entry_2 * ext2_find_entry (struct inode *,struct qstr *, struct page **);
extern int ext2_delete_entry (struct ext2_dir_entry_2 *, struct page *); extern int ext2_delete_entry (struct ext2_dir_entry_2 *, struct page *);
extern int ext2_empty_dir (struct inode *); extern int ext2_empty_dir (struct inode *);
extern struct ext2_dir_entry_2 * ext2_dotdot (struct inode *, struct page **); extern struct ext2_dir_entry_2 * ext2_dotdot (struct inode *, struct page **);

17
fs/ext2/namei.c
View file

@ -60,7 +60,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
if (dentry->d_name.len > EXT2_NAME_LEN) if (dentry->d_name.len > EXT2_NAME_LEN)
return ERR_PTR(-ENAMETOOLONG); return ERR_PTR(-ENAMETOOLONG);
ino = ext2_inode_by_name(dir, dentry); ino = ext2_inode_by_name(dir, &dentry->d_name);
inode = NULL; inode = NULL;
if (ino) { if (ino) {
inode = ext2_iget(dir->i_sb, ino); inode = ext2_iget(dir->i_sb, ino);
@ -72,13 +72,8 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
struct dentry *ext2_get_parent(struct dentry *child) struct dentry *ext2_get_parent(struct dentry *child)
{ {
unsigned long ino; struct qstr dotdot = {.name = "..", .len = 2};
struct dentry dotdot; unsigned long ino = ext2_inode_by_name(child->d_inode, &dotdot);
dotdot.d_name.name = "..";
dotdot.d_name.len = 2;
ino = ext2_inode_by_name(child->d_inode, &dotdot);
if (!ino) if (!ino)
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);
return d_obtain_alias(ext2_iget(child->d_inode->i_sb, ino)); return d_obtain_alias(ext2_iget(child->d_inode->i_sb, ino));
@ -246,7 +241,7 @@ static int ext2_unlink(struct inode * dir, struct dentry *dentry)
struct page * page; struct page * page;
int err = -ENOENT; int err = -ENOENT;
de = ext2_find_entry (dir, dentry, &page); de = ext2_find_entry (dir, &dentry->d_name, &page);
if (!de) if (!de)
goto out; goto out;
@ -288,7 +283,7 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
struct ext2_dir_entry_2 * old_de; struct ext2_dir_entry_2 * old_de;
int err = -ENOENT; int err = -ENOENT;
old_de = ext2_find_entry (old_dir, old_dentry, &old_page); old_de = ext2_find_entry (old_dir, &old_dentry->d_name, &old_page);
if (!old_de) if (!old_de)
goto out; goto out;
@ -308,7 +303,7 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
goto out_dir; goto out_dir;
err = -ENOENT; err = -ENOENT;
new_de = ext2_find_entry (new_dir, new_dentry, &new_page); new_de = ext2_find_entry (new_dir, &new_dentry->d_name, &new_page);
if (!new_de) if (!new_de)
goto out_dir; goto out_dir;
inode_inc_link_count(old_inode); inode_inc_link_count(old_inode);