Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdf01226 authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

VFS: Provide empty name qstr 



Provide an empty name (ie. "") qstr for general use.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ee416bcd

fs/dcache.c

+6 −2
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ EXPORT_SYMBOL(rename_lock); 


static struct kmem_cache *dentry_cache __read_mostly;



const struct qstr empty_name = QSTR_INIT("", 0);

EXPORT_SYMBOL(empty_name);

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

EXPORT_SYMBOL(slash_name);



/*

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

 * to the dcache: the hashtable for lookups. Somebody should try
@@ -1578,8 +1583,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name) 
	 */

	dentry->d_iname[DNAME_INLINE_LEN-1] = 0;

	if (unlikely(!name)) {

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

		name = &anon;

		name = &slash_name;

		dname = dentry->d_iname;

	} else if (name->len > DNAME_INLINE_LEN-1) {

		size_t size = offsetof(struct external_name, name[1]);

fs/gfs2/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -872,7 +872,6 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh, 
	struct buffer_head *bh;

	struct gfs2_leaf *leaf;

	struct gfs2_dirent *dent;

	struct qstr name = { .name = "" };

	struct timespec tv = current_time(inode);



	error = gfs2_alloc_blocks(ip, &bn, &n, 0, NULL);
@@ -896,7 +895,7 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh, 
	leaf->lf_sec = cpu_to_be64(tv.tv_sec);

	memset(leaf->lf_reserved2, 0, sizeof(leaf->lf_reserved2));

	dent = (struct gfs2_dirent *)(leaf+1);

	gfs2_qstr2dirent(&name, bh->b_size - sizeof(struct gfs2_leaf), dent);

	gfs2_qstr2dirent(&empty_name, bh->b_size - sizeof(struct gfs2_leaf), dent);

	*pbh = bh;

	return leaf;

}

fs/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -3400,7 +3400,6 @@ static int do_last(struct nameidata *nd, 


struct dentry *vfs_tmpfile(struct dentry *dentry, umode_t mode, int open_flag)

{

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

	struct dentry *child = NULL;

	struct inode *dir = dentry->d_inode;

	struct inode *inode;
@@ -3414,7 +3413,7 @@ struct dentry *vfs_tmpfile(struct dentry *dentry, umode_t mode, int open_flag) 
	if (!dir->i_op->tmpfile)

		goto out_err;

	error = -ENOMEM;

	child = d_alloc(dentry, &name);

	child = d_alloc(dentry, &slash_name);

	if (unlikely(!child))

		goto out_err;

	error = dir->i_op->tmpfile(dir, child, mode);

fs/nsfs.c

+1 −2
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ static void nsfs_evict(struct inode *inode) 
static void *__ns_get_path(struct path *path, struct ns_common *ns)

{

	struct vfsmount *mnt = nsfs_mnt;

	struct qstr qname = { .name = "", };

	struct dentry *dentry;

	struct inode *inode;

	unsigned long d;
@@ -85,7 +84,7 @@ static void *__ns_get_path(struct path *path, struct ns_common *ns) 
	inode->i_fop = &ns_file_operations;

	inode->i_private = ns;



	dentry = d_alloc_pseudo(mnt->mnt_sb, &qname);

	dentry = d_alloc_pseudo(mnt->mnt_sb, &empty_name);

	if (!dentry) {

		iput(inode);

		return ERR_PTR(-ENOMEM);

fs/pipe.c

+1 −2
Original line number Diff line number Diff line
@@ -739,13 +739,12 @@ int create_pipe_files(struct file **res, int flags) 
	struct inode *inode = get_pipe_inode();

	struct file *f;

	struct path path;

	static struct qstr name = { .name = "" };



	if (!inode)

		return -ENFILE;



	err = -ENOMEM;

	path.dentry = d_alloc_pseudo(pipe_mnt->mnt_sb, &name);

	path.dentry = d_alloc_pseudo(pipe_mnt->mnt_sb, &empty_name);

	if (!path.dentry)

		goto err_inode;

	path.mnt = mntget(pipe_mnt);