diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-02-01 04:43:32 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-01 23:19:16 -0400 |
commit | 627bf81ac625f05060db033a0f3791521ad7bd79 (patch) | |
tree | 5c88cb13dae2529cf4c778416c88b6c13cd4f38f /security | |
parent | 05faf3169f039cb03ebabdfee6eda0e7ada5ea11 (diff) |
get rid of pointless checks for NULL ->i_op
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/evm/evm_crypto.c | 2 | ||||
-rw-r--r-- | security/integrity/evm/evm_main.c | 2 | ||||
-rw-r--r-- | security/tomoyo/realpath.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c index 3bab89eb21d6..e90ab0e20db8 100644 --- a/security/integrity/evm/evm_crypto.c +++ b/security/integrity/evm/evm_crypto.c | |||
@@ -137,7 +137,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry, | |||
137 | int error; | 137 | int error; |
138 | int size; | 138 | int size; |
139 | 139 | ||
140 | if (!inode->i_op || !inode->i_op->getxattr) | 140 | if (!inode->i_op->getxattr) |
141 | return -EOPNOTSUPP; | 141 | return -EOPNOTSUPP; |
142 | desc = init_desc(type); | 142 | desc = init_desc(type); |
143 | if (IS_ERR(desc)) | 143 | if (IS_ERR(desc)) |
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index 336b3ddfe63f..bab1c39ffcaf 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c | |||
@@ -62,7 +62,7 @@ static int evm_find_protected_xattrs(struct dentry *dentry) | |||
62 | int error; | 62 | int error; |
63 | int count = 0; | 63 | int count = 0; |
64 | 64 | ||
65 | if (!inode->i_op || !inode->i_op->getxattr) | 65 | if (!inode->i_op->getxattr) |
66 | return -EOPNOTSUPP; | 66 | return -EOPNOTSUPP; |
67 | 67 | ||
68 | for (xattr = evm_config_xattrnames; *xattr != NULL; xattr++) { | 68 | for (xattr = evm_config_xattrnames; *xattr != NULL; xattr++) { |
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index 80a09c37cac8..a3386d119425 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c | |||
@@ -173,7 +173,7 @@ static char *tomoyo_get_local_path(struct dentry *dentry, char * const buffer, | |||
173 | * Use filesystem name if filesystem does not support rename() | 173 | * Use filesystem name if filesystem does not support rename() |
174 | * operation. | 174 | * operation. |
175 | */ | 175 | */ |
176 | if (inode->i_op && !inode->i_op->rename) | 176 | if (!inode->i_op->rename) |
177 | goto prepend_filesystem_name; | 177 | goto prepend_filesystem_name; |
178 | } | 178 | } |
179 | /* Prepend device name. */ | 179 | /* Prepend device name. */ |
@@ -282,7 +282,7 @@ char *tomoyo_realpath_from_path(struct path *path) | |||
282 | * Get local name for filesystems without rename() operation | 282 | * Get local name for filesystems without rename() operation |
283 | * or dentry without vfsmount. | 283 | * or dentry without vfsmount. |
284 | */ | 284 | */ |
285 | if (!path->mnt || (inode->i_op && !inode->i_op->rename)) | 285 | if (!path->mnt || !inode->i_op->rename) |
286 | pos = tomoyo_get_local_path(path->dentry, buf, | 286 | pos = tomoyo_get_local_path(path->dentry, buf, |
287 | buf_len - 1); | 287 | buf_len - 1); |
288 | /* Get absolute name for the rest. */ | 288 | /* Get absolute name for the rest. */ |