projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bna: fix firmware loading on big-endian machines
[cascardo/linux.git]
/
security
/
inode.c
diff --git
a/security/inode.c
b/security/inode.c
index
131a3c4
..
91503b7
100644
(file)
--- a/
security/inode.c
+++ b/
security/inode.c
@@
-27,7
+27,7
@@
static int mount_count;
static inline int positive(struct dentry *dentry)
{
static inline int positive(struct dentry *dentry)
{
- return d
entry->d_inode
&& !d_unhashed(dentry);
+ return d
_really_is_positive(dentry)
&& !d_unhashed(dentry);
}
static int fill_super(struct super_block *sb, void *data, int silent)
}
static int fill_super(struct super_block *sb, void *data, int silent)
@@
-102,14
+102,14
@@
struct dentry *securityfs_create_file(const char *name, umode_t mode,
if (!parent)
parent = mount->mnt_root;
if (!parent)
parent = mount->mnt_root;
- dir =
parent->d_inode
;
+ dir =
d_inode(parent)
;
mutex_lock(&dir->i_mutex);
dentry = lookup_one_len(name, parent, strlen(name));
if (IS_ERR(dentry))
goto out;
mutex_lock(&dir->i_mutex);
dentry = lookup_one_len(name, parent, strlen(name));
if (IS_ERR(dentry))
goto out;
- if (d
entry->d_inode
) {
+ if (d
_really_is_positive(dentry)
) {
error = -EEXIST;
goto out1;
}
error = -EEXIST;
goto out1;
}
@@
-197,20
+197,20
@@
void securityfs_remove(struct dentry *dentry)
return;
parent = dentry->d_parent;
return;
parent = dentry->d_parent;
- if (!parent ||
!parent->d_inode
)
+ if (!parent ||
d_really_is_negative(parent)
)
return;
return;
- mutex_lock(&
parent->d_inode
->i_mutex);
+ mutex_lock(&
d_inode(parent)
->i_mutex);
if (positive(dentry)) {
if (positive(dentry)) {
- if (d
entry->d_inode
) {
+ if (d
_really_is_positive(dentry)
) {
if (d_is_dir(dentry))
if (d_is_dir(dentry))
- simple_rmdir(
parent->d_inode
, dentry);
+ simple_rmdir(
d_inode(parent)
, dentry);
else
else
- simple_unlink(
parent->d_inode
, dentry);
+ simple_unlink(
d_inode(parent)
, dentry);
dput(dentry);
}
}
dput(dentry);
}
}
- mutex_unlock(&
parent->d_inode
->i_mutex);
+ mutex_unlock(&
d_inode(parent)
->i_mutex);
simple_release_fs(&mount, &mount_count);
}
EXPORT_SYMBOL_GPL(securityfs_remove);
simple_release_fs(&mount, &mount_count);
}
EXPORT_SYMBOL_GPL(securityfs_remove);