mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -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
|
|
@ -435,7 +435,7 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,
|
|||
*/
|
||||
int nilfs_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 unsigned char *name = dentry->d_name.name;
|
||||
int namelen = dentry->d_name.len;
|
||||
unsigned chunk_size = nilfs_chunk_size(dir);
|
||||
|
|
|
|||
|
|
@ -834,7 +834,7 @@ void nilfs_evict_inode(struct inode *inode)
|
|||
int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
|
||||
{
|
||||
struct nilfs_transaction_info ti;
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
struct super_block *sb = inode->i_sb;
|
||||
int err;
|
||||
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ out_fail:
|
|||
static int nilfs_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);
|
||||
struct nilfs_transaction_info ti;
|
||||
int err;
|
||||
|
||||
|
|
@ -283,7 +283,7 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)
|
|||
if (!de)
|
||||
goto out;
|
||||
|
||||
inode = dentry->d_inode;
|
||||
inode = d_inode(dentry);
|
||||
err = -EIO;
|
||||
if (le64_to_cpu(de->inode) != inode->i_ino)
|
||||
goto out;
|
||||
|
|
@ -318,7 +318,7 @@ static int nilfs_unlink(struct inode *dir, struct dentry *dentry)
|
|||
|
||||
if (!err) {
|
||||
nilfs_mark_inode_dirty(dir);
|
||||
nilfs_mark_inode_dirty(dentry->d_inode);
|
||||
nilfs_mark_inode_dirty(d_inode(dentry));
|
||||
err = nilfs_transaction_commit(dir->i_sb);
|
||||
} else
|
||||
nilfs_transaction_abort(dir->i_sb);
|
||||
|
|
@ -328,7 +328,7 @@ static int nilfs_unlink(struct inode *dir, struct dentry *dentry)
|
|||
|
||||
static int nilfs_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
struct nilfs_transaction_info ti;
|
||||
int err;
|
||||
|
||||
|
|
@ -358,8 +358,8 @@ static int nilfs_rmdir(struct inode *dir, struct dentry *dentry)
|
|||
static int nilfs_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 nilfs_dir_entry *dir_de = NULL;
|
||||
struct page *old_page;
|
||||
|
|
@ -453,13 +453,13 @@ static struct dentry *nilfs_get_parent(struct dentry *child)
|
|||
struct qstr dotdot = QSTR_INIT("..", 2);
|
||||
struct nilfs_root *root;
|
||||
|
||||
ino = nilfs_inode_by_name(child->d_inode, &dotdot);
|
||||
ino = nilfs_inode_by_name(d_inode(child), &dotdot);
|
||||
if (!ino)
|
||||
return ERR_PTR(-ENOENT);
|
||||
|
||||
root = NILFS_I(child->d_inode)->i_root;
|
||||
root = NILFS_I(d_inode(child))->i_root;
|
||||
|
||||
inode = nilfs_iget(child->d_inode->i_sb, root, ino);
|
||||
inode = nilfs_iget(d_inode(child)->i_sb, root, ino);
|
||||
if (IS_ERR(inode))
|
||||
return ERR_CAST(inode);
|
||||
|
||||
|
|
|
|||
|
|
@ -610,7 +610,7 @@ static int nilfs_unfreeze(struct super_block *sb)
|
|||
static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf)
|
||||
{
|
||||
struct super_block *sb = dentry->d_sb;
|
||||
struct nilfs_root *root = NILFS_I(dentry->d_inode)->i_root;
|
||||
struct nilfs_root *root = NILFS_I(d_inode(dentry))->i_root;
|
||||
struct the_nilfs *nilfs = root->nilfs;
|
||||
u64 id = huge_encode_dev(sb->s_bdev->bd_dev);
|
||||
unsigned long long blocks;
|
||||
|
|
@ -681,7 +681,7 @@ static int nilfs_show_options(struct seq_file *seq, struct dentry *dentry)
|
|||
{
|
||||
struct super_block *sb = dentry->d_sb;
|
||||
struct the_nilfs *nilfs = sb->s_fs_info;
|
||||
struct nilfs_root *root = NILFS_I(dentry->d_inode)->i_root;
|
||||
struct nilfs_root *root = NILFS_I(d_inode(dentry))->i_root;
|
||||
|
||||
if (!nilfs_test_opt(nilfs, BARRIER))
|
||||
seq_puts(seq, ",nobarrier");
|
||||
|
|
@ -1190,7 +1190,7 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data)
|
|||
|
||||
sb->s_flags &= ~MS_RDONLY;
|
||||
|
||||
root = NILFS_I(sb->s_root->d_inode)->i_root;
|
||||
root = NILFS_I(d_inode(sb->s_root))->i_root;
|
||||
err = nilfs_attach_log_writer(sb, root);
|
||||
if (err)
|
||||
goto restore_opts;
|
||||
|
|
|
|||
Loading…
Reference in a new issue