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

Commit a7400222 authored by Al Viro's avatar Al Viro
Browse files

new helper: is_root_inode() 



replace open-coded instances

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

fs/coda/coda_linux.c

+0 −6
Original line number Diff line number Diff line
@@ -40,12 +40,6 @@ int coda_iscontrol(const char *name, size_t length) 
                (strncmp(name, CODA_CONTROL, CODA_CONTROLLEN) == 0));

}



/* recognize /coda inode */

int coda_isroot(struct inode *i)

{

    return ( i->i_sb->s_root->d_inode == i );

}



unsigned short coda_flags_to_cflags(unsigned short flags)

{

	unsigned short coda_flags = 0;

fs/coda/coda_linux.h

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ int coda_setattr(struct dentry *, struct iattr *); 


/* this file:  heloers */

char *coda_f2s(struct CodaFid *f);

int coda_isroot(struct inode *i);

int coda_iscontrol(const char *name, size_t length);



void coda_vattr_to_iattr(struct inode *, struct coda_vattr *);

fs/coda/dir.c

+6 −6
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, unsig 
	}



	/* control object, create inode on the fly */

	if (coda_isroot(dir) && coda_iscontrol(name, length)) {

	if (is_root_inode(dir) && coda_iscontrol(name, length)) {

		inode = coda_cnode_makectl(sb);

		type = CODA_NOCACHE;

	} else {
@@ -195,7 +195,7 @@ static int coda_create(struct inode *dir, struct dentry *de, umode_t mode, bool 
	struct CodaFid newfid;

	struct coda_vattr attrs;



	if (coda_isroot(dir) && coda_iscontrol(name, length))

	if (is_root_inode(dir) && coda_iscontrol(name, length))

		return -EPERM;



	error = venus_create(dir->i_sb, coda_i2f(dir), name, length,
@@ -227,7 +227,7 @@ static int coda_mkdir(struct inode *dir, struct dentry *de, umode_t mode) 
	int error;

	struct CodaFid newfid;



	if (coda_isroot(dir) && coda_iscontrol(name, len))

	if (is_root_inode(dir) && coda_iscontrol(name, len))

		return -EPERM;



	attrs.va_mode = mode;
@@ -261,7 +261,7 @@ static int coda_link(struct dentry *source_de, struct inode *dir_inode, 
	int len = de->d_name.len;

	int error;



	if (coda_isroot(dir_inode) && coda_iscontrol(name, len))

	if (is_root_inode(dir_inode) && coda_iscontrol(name, len))

		return -EPERM;



	error = venus_link(dir_inode->i_sb, coda_i2f(inode),
@@ -287,7 +287,7 @@ static int coda_symlink(struct inode *dir_inode, struct dentry *de, 
	int symlen;

	int error;



	if (coda_isroot(dir_inode) && coda_iscontrol(name, len))

	if (is_root_inode(dir_inode) && coda_iscontrol(name, len))

		return -EPERM;



	symlen = strlen(symname);
@@ -507,7 +507,7 @@ static int coda_dentry_revalidate(struct dentry *de, unsigned int flags) 
		return -ECHILD;



	inode = de->d_inode;

	if (!inode || coda_isroot(inode))

	if (!inode || is_root_inode(inode))

		goto out;

	if (is_bad_inode(inode))

		goto bad;

fs/ncpfs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ ncp_single_volume(struct ncp_server *server) 


static inline int ncp_is_server_root(struct inode *inode)

{

	return (!ncp_single_volume(NCP_SERVER(inode)) &&

		inode == inode->i_sb->s_root->d_inode);

	return !ncp_single_volume(NCP_SERVER(inode)) &&

		is_root_inode(inode);

}

include/linux/fs.h

+5 −0
Original line number Diff line number Diff line
@@ -2789,6 +2789,11 @@ static inline void inode_has_no_xattr(struct inode *inode) 
		inode->i_flags |= S_NOSEC;

}



static inline bool is_root_inode(struct inode *inode)

{

	return inode == inode->i_sb->s_root->d_inode;

}



static inline bool dir_emit(struct dir_context *ctx,

			    const char *name, int namelen,

			    u64 ino, unsigned type)