mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
VFS: normal filesystems (and lustre): d_inode() annotations
that's the bulk of filesystem drivers dealing with inodes of their own Signed-off-by: David Howells <[email protected]> Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
ce0b16ddf1
commit
2b0143b5c9
278 changed files with 1419 additions and 1420 deletions
|
|
@ -486,7 +486,7 @@ void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
|
|||
*/
|
||||
int ext2_add_link (struct dentry *dentry, struct inode *inode)
|
||||
{
|
||||
struct inode *dir = dentry->d_parent->d_inode;
|
||||
struct inode *dir = d_inode(dentry->d_parent);
|
||||
const char *name = dentry->d_name.name;
|
||||
int namelen = dentry->d_name.len;
|
||||
unsigned chunk_size = ext2_chunk_size(dir);
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent)
|
|||
avefreeb = free_blocks / ngroups;
|
||||
ndirs = percpu_counter_read_positive(&sbi->s_dirs_counter);
|
||||
|
||||
if ((parent == sb->s_root->d_inode) ||
|
||||
if ((parent == d_inode(sb->s_root)) ||
|
||||
(EXT2_I(parent)->i_flags & EXT2_TOPDIR_FL)) {
|
||||
struct ext2_group_desc *best_desc = NULL;
|
||||
int best_ndir = inodes_per_group;
|
||||
|
|
|
|||
|
|
@ -1547,7 +1547,7 @@ int ext2_write_inode(struct inode *inode, struct writeback_control *wbc)
|
|||
|
||||
int ext2_setattr(struct dentry *dentry, struct iattr *iattr)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
int error;
|
||||
|
||||
error = inode_change_ok(inode, iattr);
|
||||
|
|
|
|||
|
|
@ -79,10 +79,10 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, uns
|
|||
struct dentry *ext2_get_parent(struct dentry *child)
|
||||
{
|
||||
struct qstr dotdot = QSTR_INIT("..", 2);
|
||||
unsigned long ino = ext2_inode_by_name(child->d_inode, &dotdot);
|
||||
unsigned long ino = ext2_inode_by_name(d_inode(child), &dotdot);
|
||||
if (!ino)
|
||||
return ERR_PTR(-ENOENT);
|
||||
return d_obtain_alias(ext2_iget(child->d_inode->i_sb, ino));
|
||||
return d_obtain_alias(ext2_iget(d_inode(child)->i_sb, ino));
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -214,7 +214,7 @@ out_fail:
|
|||
static int ext2_link (struct dentry * old_dentry, struct inode * dir,
|
||||
struct dentry *dentry)
|
||||
{
|
||||
struct inode *inode = old_dentry->d_inode;
|
||||
struct inode *inode = d_inode(old_dentry);
|
||||
int err;
|
||||
|
||||
dquot_initialize(dir);
|
||||
|
|
@ -281,7 +281,7 @@ out_dir:
|
|||
|
||||
static int ext2_unlink(struct inode * dir, struct dentry *dentry)
|
||||
{
|
||||
struct inode * inode = dentry->d_inode;
|
||||
struct inode * inode = d_inode(dentry);
|
||||
struct ext2_dir_entry_2 * de;
|
||||
struct page * page;
|
||||
int err = -ENOENT;
|
||||
|
|
@ -305,7 +305,7 @@ out:
|
|||
|
||||
static int ext2_rmdir (struct inode * dir, struct dentry *dentry)
|
||||
{
|
||||
struct inode * inode = dentry->d_inode;
|
||||
struct inode * inode = d_inode(dentry);
|
||||
int err = -ENOTEMPTY;
|
||||
|
||||
if (ext2_empty_dir(inode)) {
|
||||
|
|
@ -322,8 +322,8 @@ static int ext2_rmdir (struct inode * dir, struct dentry *dentry)
|
|||
static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
|
||||
struct inode * new_dir, struct dentry * new_dentry )
|
||||
{
|
||||
struct inode * old_inode = old_dentry->d_inode;
|
||||
struct inode * new_inode = new_dentry->d_inode;
|
||||
struct inode * old_inode = d_inode(old_dentry);
|
||||
struct inode * new_inode = d_inode(new_dentry);
|
||||
struct page * dir_page = NULL;
|
||||
struct ext2_dir_entry_2 * dir_de = NULL;
|
||||
struct page * old_page;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
static void *ext2_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
{
|
||||
struct ext2_inode_info *ei = EXT2_I(dentry->d_inode);
|
||||
struct ext2_inode_info *ei = EXT2_I(d_inode(dentry));
|
||||
nd_set_link(nd, (char *)ei->i_data);
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ cleanup:
|
|||
static int
|
||||
ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
struct buffer_head *bh = NULL;
|
||||
struct ext2_xattr_entry *entry;
|
||||
char *end;
|
||||
|
|
@ -319,7 +319,7 @@ cleanup:
|
|||
/*
|
||||
* Inode operation listxattr()
|
||||
*
|
||||
* dentry->d_inode->i_mutex: don't care
|
||||
* d_inode(dentry)->i_mutex: don't care
|
||||
*/
|
||||
ssize_t
|
||||
ext2_listxattr(struct dentry *dentry, char *buffer, size_t size)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ ext2_xattr_security_get(struct dentry *dentry, const char *name,
|
|||
{
|
||||
if (strcmp(name, "") == 0)
|
||||
return -EINVAL;
|
||||
return ext2_xattr_get(dentry->d_inode, EXT2_XATTR_INDEX_SECURITY, name,
|
||||
return ext2_xattr_get(d_inode(dentry), EXT2_XATTR_INDEX_SECURITY, name,
|
||||
buffer, size);
|
||||
}
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ ext2_xattr_security_set(struct dentry *dentry, const char *name,
|
|||
{
|
||||
if (strcmp(name, "") == 0)
|
||||
return -EINVAL;
|
||||
return ext2_xattr_set(dentry->d_inode, EXT2_XATTR_INDEX_SECURITY, name,
|
||||
return ext2_xattr_set(d_inode(dentry), EXT2_XATTR_INDEX_SECURITY, name,
|
||||
value, size, flags);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ ext2_xattr_trusted_get(struct dentry *dentry, const char *name,
|
|||
{
|
||||
if (strcmp(name, "") == 0)
|
||||
return -EINVAL;
|
||||
return ext2_xattr_get(dentry->d_inode, EXT2_XATTR_INDEX_TRUSTED, name,
|
||||
return ext2_xattr_get(d_inode(dentry), EXT2_XATTR_INDEX_TRUSTED, name,
|
||||
buffer, size);
|
||||
}
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ ext2_xattr_trusted_set(struct dentry *dentry, const char *name,
|
|||
{
|
||||
if (strcmp(name, "") == 0)
|
||||
return -EINVAL;
|
||||
return ext2_xattr_set(dentry->d_inode, EXT2_XATTR_INDEX_TRUSTED, name,
|
||||
return ext2_xattr_set(d_inode(dentry), EXT2_XATTR_INDEX_TRUSTED, name,
|
||||
value, size, flags);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ ext2_xattr_user_get(struct dentry *dentry, const char *name,
|
|||
return -EINVAL;
|
||||
if (!test_opt(dentry->d_sb, XATTR_USER))
|
||||
return -EOPNOTSUPP;
|
||||
return ext2_xattr_get(dentry->d_inode, EXT2_XATTR_INDEX_USER,
|
||||
return ext2_xattr_get(d_inode(dentry), EXT2_XATTR_INDEX_USER,
|
||||
name, buffer, size);
|
||||
}
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ ext2_xattr_user_set(struct dentry *dentry, const char *name,
|
|||
if (!test_opt(dentry->d_sb, XATTR_USER))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
return ext2_xattr_set(dentry->d_inode, EXT2_XATTR_INDEX_USER,
|
||||
return ext2_xattr_set(d_inode(dentry), EXT2_XATTR_INDEX_USER,
|
||||
name, value, size, flags);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue