get rid of pointless checks for NULL ->i_op
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -124,7 +124,6 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache)
|
|||||||
/* check parameters */
|
/* check parameters */
|
||||||
ret = -EOPNOTSUPP;
|
ret = -EOPNOTSUPP;
|
||||||
if (!root->d_inode ||
|
if (!root->d_inode ||
|
||||||
!root->d_inode->i_op ||
|
|
||||||
!root->d_inode->i_op->lookup ||
|
!root->d_inode->i_op->lookup ||
|
||||||
!root->d_inode->i_op->mkdir ||
|
!root->d_inode->i_op->mkdir ||
|
||||||
!root->d_inode->i_op->setxattr ||
|
!root->d_inode->i_op->setxattr ||
|
||||||
|
|||||||
@@ -779,8 +779,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
|
|||||||
}
|
}
|
||||||
|
|
||||||
ret = -EPERM;
|
ret = -EPERM;
|
||||||
if (!subdir->d_inode->i_op ||
|
if (!subdir->d_inode->i_op->setxattr ||
|
||||||
!subdir->d_inode->i_op->setxattr ||
|
|
||||||
!subdir->d_inode->i_op->getxattr ||
|
!subdir->d_inode->i_op->getxattr ||
|
||||||
!subdir->d_inode->i_op->lookup ||
|
!subdir->d_inode->i_op->lookup ||
|
||||||
!subdir->d_inode->i_op->mkdir ||
|
!subdir->d_inode->i_op->mkdir ||
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
|
|||||||
int error;
|
int error;
|
||||||
int size;
|
int size;
|
||||||
|
|
||||||
if (!inode->i_op || !inode->i_op->getxattr)
|
if (!inode->i_op->getxattr)
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
desc = init_desc(type);
|
desc = init_desc(type);
|
||||||
if (IS_ERR(desc))
|
if (IS_ERR(desc))
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ static int evm_find_protected_xattrs(struct dentry *dentry)
|
|||||||
int error;
|
int error;
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
if (!inode->i_op || !inode->i_op->getxattr)
|
if (!inode->i_op->getxattr)
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
for (xattr = evm_config_xattrnames; *xattr != NULL; xattr++) {
|
for (xattr = evm_config_xattrnames; *xattr != NULL; xattr++) {
|
||||||
|
|||||||
@@ -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()
|
* Use filesystem name if filesystem does not support rename()
|
||||||
* operation.
|
* operation.
|
||||||
*/
|
*/
|
||||||
if (inode->i_op && !inode->i_op->rename)
|
if (!inode->i_op->rename)
|
||||||
goto prepend_filesystem_name;
|
goto prepend_filesystem_name;
|
||||||
}
|
}
|
||||||
/* Prepend device name. */
|
/* Prepend device name. */
|
||||||
@@ -282,7 +282,7 @@ char *tomoyo_realpath_from_path(struct path *path)
|
|||||||
* Get local name for filesystems without rename() operation
|
* Get local name for filesystems without rename() operation
|
||||||
* or dentry without vfsmount.
|
* 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,
|
pos = tomoyo_get_local_path(path->dentry, buf,
|
||||||
buf_len - 1);
|
buf_len - 1);
|
||||||
/* Get absolute name for the rest. */
|
/* Get absolute name for the rest. */
|
||||||
|
|||||||
Reference in New Issue
Block a user