don't bother with ->d_inode->i_sb - it's always equal to ->d_sb
... and neither can ever be NULL Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -299,8 +299,8 @@ static int evm_protect_xattr(struct dentry *dentry, const char *xattr_name,
|
||||
return 0;
|
||||
|
||||
/* exception for pseudo filesystems */
|
||||
if (dentry->d_inode->i_sb->s_magic == TMPFS_MAGIC
|
||||
|| dentry->d_inode->i_sb->s_magic == SYSFS_MAGIC)
|
||||
if (dentry->d_sb->s_magic == TMPFS_MAGIC
|
||||
|| dentry->d_sb->s_magic == SYSFS_MAGIC)
|
||||
return 0;
|
||||
|
||||
integrity_audit_msg(AUDIT_INTEGRITY_METADATA,
|
||||
|
||||
@@ -1316,7 +1316,7 @@ static int selinux_genfs_get_sid(struct dentry *dentry,
|
||||
u32 *sid)
|
||||
{
|
||||
int rc;
|
||||
struct super_block *sb = dentry->d_inode->i_sb;
|
||||
struct super_block *sb = dentry->d_sb;
|
||||
char *buffer, *path;
|
||||
|
||||
buffer = (char *)__get_free_page(GFP_KERNEL);
|
||||
|
||||
@@ -1444,7 +1444,7 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name)
|
||||
* XATTR_NAME_SMACKIPOUT
|
||||
*/
|
||||
if (strcmp(name, XATTR_NAME_SMACK) == 0) {
|
||||
struct super_block *sbp = d_backing_inode(dentry)->i_sb;
|
||||
struct super_block *sbp = dentry->d_sb;
|
||||
struct superblock_smack *sbsp = sbp->s_security;
|
||||
|
||||
isp->smk_inode = sbsp->smk_default;
|
||||
|
||||
Reference in New Issue
Block a user