projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-linus
[cascardo/linux.git]
/
fs
/
inode.c
diff --git
a/fs/inode.c
b/fs/inode.c
index
9cef4e1
..
7e3ef3a
100644
(file)
--- a/
fs/inode.c
+++ b/
fs/inode.c
@@
-345,7
+345,7
@@
EXPORT_SYMBOL(inc_nlink);
void address_space_init_once(struct address_space *mapping)
{
memset(mapping, 0, sizeof(*mapping));
void address_space_init_once(struct address_space *mapping)
{
memset(mapping, 0, sizeof(*mapping));
- INIT_RADIX_TREE(&mapping->page_tree, GFP_ATOMIC);
+ INIT_RADIX_TREE(&mapping->page_tree, GFP_ATOMIC
| __GFP_ACCOUNT
);
spin_lock_init(&mapping->tree_lock);
init_rwsem(&mapping->i_mmap_rwsem);
INIT_LIST_HEAD(&mapping->private_list);
spin_lock_init(&mapping->tree_lock);
init_rwsem(&mapping->i_mmap_rwsem);
INIT_LIST_HEAD(&mapping->private_list);
@@
-1729,7
+1729,6
@@
int dentry_needs_remove_privs(struct dentry *dentry)
mask |= ATTR_KILL_PRIV;
return mask;
}
mask |= ATTR_KILL_PRIV;
return mask;
}
-EXPORT_SYMBOL(dentry_needs_remove_privs);
static int __remove_privs(struct dentry *dentry, int kill)
{
static int __remove_privs(struct dentry *dentry, int kill)
{
@@
-1749,8
+1748,8
@@
static int __remove_privs(struct dentry *dentry, int kill)
*/
int file_remove_privs(struct file *file)
{
*/
int file_remove_privs(struct file *file)
{
- struct dentry *dentry = file
->f_path.dentry
;
- struct inode *inode =
d_inode(dentry
);
+ struct dentry *dentry = file
_dentry(file)
;
+ struct inode *inode =
file_inode(file
);
int kill;
int error = 0;
int kill;
int error = 0;
@@
-1758,7
+1757,7
@@
int file_remove_privs(struct file *file)
if (IS_NOSEC(inode))
return 0;
if (IS_NOSEC(inode))
return 0;
- kill =
file_needs_remove_privs(file
);
+ kill =
dentry_needs_remove_privs(dentry
);
if (kill < 0)
return kill;
if (kill)
if (kill < 0)
return kill;
if (kill)