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

Commit 627bf81a authored by Al Viro's avatar Al Viro
Browse files

get rid of pointless checks for NULL ->i_op 



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

fs/cachefiles/bind.c

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache) 
	/* check parameters */

	ret = -EOPNOTSUPP;

	if (!root->d_inode ||

	    !root->d_inode->i_op ||

	    !root->d_inode->i_op->lookup ||

	    !root->d_inode->i_op->mkdir ||

	    !root->d_inode->i_op->setxattr ||

fs/cachefiles/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -779,8 +779,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, 
	}



	ret = -EPERM;

	if (!subdir->d_inode->i_op ||

	    !subdir->d_inode->i_op->setxattr ||

	if (!subdir->d_inode->i_op->setxattr ||

	    !subdir->d_inode->i_op->getxattr ||

	    !subdir->d_inode->i_op->lookup ||

	    !subdir->d_inode->i_op->mkdir ||

security/integrity/evm/evm_crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry, 
	int error;

	int size;



	if (!inode->i_op || !inode->i_op->getxattr)

	if (!inode->i_op->getxattr)

		return -EOPNOTSUPP;

	desc = init_desc(type);

	if (IS_ERR(desc))

security/integrity/evm/evm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int evm_find_protected_xattrs(struct dentry *dentry) 
	int error;

	int count = 0;



	if (!inode->i_op || !inode->i_op->getxattr)

	if (!inode->i_op->getxattr)

		return -EOPNOTSUPP;



	for (xattr = evm_config_xattrnames; *xattr != NULL; xattr++) {

security/tomoyo/realpath.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static char *tomoyo_get_local_path(struct dentry *dentry, char * const buffer, 
		 * Use filesystem name if filesystem does not support rename()

		 * operation.

		 */

		if (inode->i_op && !inode->i_op->rename)

		if (!inode->i_op->rename)

			goto prepend_filesystem_name;

	}

	/* Prepend device name. */
@@ -282,7 +282,7 @@ char *tomoyo_realpath_from_path(struct path *path) 
		 * Get local name for filesystems without rename() operation

		 * or dentry without vfsmount.

		 */

		if (!path->mnt || (inode->i_op && !inode->i_op->rename))

		if (!path->mnt || !inode->i_op->rename)

			pos = tomoyo_get_local_path(path->dentry, buf,

						    buf_len - 1);

		/* Get absolute name for the rest. */