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

Commit e45b590b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

[PATCH] change d_add_ci argument ordering 



As pointed out during review d_add_ci argument order should match d_add,
so switch the dentry and inode arguments.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2d8a10cd

fs/dcache.c

+1 −1
Original line number Diff line number Diff line
@@ -1236,7 +1236,7 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry) 
 * If no entry exists with the exact case name, allocate new dentry with

 * the exact case, and return the spliced entry.

 */

struct dentry *d_add_ci(struct inode *inode, struct dentry *dentry,

struct dentry *d_add_ci(struct dentry *dentry, struct inode *inode,

			struct qstr *name)

{

	int error;

fs/xfs/linux-2.6/xfs_iops.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ xfs_vn_ci_lookup( 
	/* else case-insensitive match... */

	dname.name = ci_name.name;

	dname.len = ci_name.len;

	dentry = d_add_ci(VFS_I(ip), dentry, &dname);

	dentry = d_add_ci(dentry, VFS_I(ip), &dname);

	kmem_free(ci_name.name);

	return dentry;

}

include/linux/dcache.h

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ extern void d_delete(struct dentry *); 
extern struct dentry * d_alloc(struct dentry *, const struct qstr *);

extern struct dentry * d_alloc_anon(struct inode *);

extern struct dentry * d_splice_alias(struct inode *, struct dentry *);

extern struct dentry * d_add_ci(struct inode *, struct dentry *, struct qstr *);

extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *);

extern void shrink_dcache_sb(struct super_block *);

extern void shrink_dcache_parent(struct dentry *);

extern void shrink_dcache_for_umount(struct super_block *);