Commit 80e5d1ff authored by Al Viro's avatar Al Viro
Browse files

useful constants: struct qstr for ".." 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d692d397

fs/dcache.c

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ const struct qstr empty_name = QSTR_INIT("", 0); 
EXPORT_SYMBOL(empty_name);

const struct qstr slash_name = QSTR_INIT("/", 1);

EXPORT_SYMBOL(slash_name);

const struct qstr dotdot_name = QSTR_INIT("..", 2);

EXPORT_SYMBOL(dotdot_name);



/*

 * This is the single most critical data structure when it comes

fs/ext2/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -81,11 +81,10 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, uns 


struct dentry *ext2_get_parent(struct dentry *child)

{

	struct qstr dotdot = QSTR_INIT("..", 2);

	ino_t ino;

	int res;



	res = ext2_inode_by_name(d_inode(child), &dotdot, &ino);

	res = ext2_inode_by_name(d_inode(child), &dotdot_name, &ino);

	if (res)

		return ERR_PTR(res);

fs/ext4/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -1739,11 +1739,10 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi 
struct dentry *ext4_get_parent(struct dentry *child)

{

	__u32 ino;

	static const struct qstr dotdot = QSTR_INIT("..", 2);

	struct ext4_dir_entry_2 * de;

	struct buffer_head *bh;



	bh = ext4_find_entry(d_inode(child), &dotdot, &de, NULL);

	bh = ext4_find_entry(d_inode(child), &dotdot_name, &de, NULL);

	if (IS_ERR(bh))

		return ERR_CAST(bh);

	if (!bh)

fs/f2fs/dir.c

+1 −3
Original line number Diff line number Diff line
@@ -449,9 +449,7 @@ struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir, 


struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct page **p)

{

	struct qstr dotdot = QSTR_INIT("..", 2);



	return f2fs_find_entry(dir, &dotdot, p);

	return f2fs_find_entry(dir, &dotdot_name, p);

}



ino_t f2fs_inode_by_name(struct inode *dir, const struct qstr *qstr,

fs/f2fs/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -416,9 +416,8 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir, 


struct dentry *f2fs_get_parent(struct dentry *child)

{

	struct qstr dotdot = QSTR_INIT("..", 2);

	struct page *page;

	unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot, &page);

	unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot_name, &page);

	if (!ino) {

		if (IS_ERR(page))

			return ERR_CAST(page);