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 <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -379,7 +379,7 @@ ino_t exofs_parent_ino(struct dentry *child)
|
||||
struct exofs_dir_entry *de;
|
||||
ino_t ino;
|
||||
|
||||
de = exofs_dotdot(child->d_inode, &page);
|
||||
de = exofs_dotdot(d_inode(child), &page);
|
||||
if (!de)
|
||||
return 0;
|
||||
|
||||
@@ -429,7 +429,7 @@ int exofs_set_link(struct inode *dir, struct exofs_dir_entry *de,
|
||||
|
||||
int exofs_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 = exofs_chunk_size(dir);
|
||||
|
||||
@@ -1028,7 +1028,7 @@ static int _do_truncate(struct inode *inode, loff_t newsize)
|
||||
*/
|
||||
int exofs_setattr(struct dentry *dentry, struct iattr *iattr)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
int error;
|
||||
|
||||
/* if we are about to modify an object, and it hasn't been
|
||||
|
||||
@@ -141,7 +141,7 @@ out_fail:
|
||||
static int exofs_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);
|
||||
|
||||
inode->i_ctime = CURRENT_TIME;
|
||||
inode_inc_link_count(inode);
|
||||
@@ -191,7 +191,7 @@ out_dir:
|
||||
|
||||
static int exofs_unlink(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
struct exofs_dir_entry *de;
|
||||
struct page *page;
|
||||
int err = -ENOENT;
|
||||
@@ -213,7 +213,7 @@ out:
|
||||
|
||||
static int exofs_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
int err = -ENOTEMPTY;
|
||||
|
||||
if (exofs_empty_dir(inode)) {
|
||||
@@ -230,8 +230,8 @@ static int exofs_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
static int exofs_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 exofs_dir_entry *dir_de = NULL;
|
||||
struct page *old_page;
|
||||
|
||||
@@ -958,7 +958,7 @@ static struct dentry *exofs_get_parent(struct dentry *child)
|
||||
if (!ino)
|
||||
return ERR_PTR(-ESTALE);
|
||||
|
||||
return d_obtain_alias(exofs_iget(child->d_inode->i_sb, ino));
|
||||
return d_obtain_alias(exofs_iget(d_inode(child)->i_sb, ino));
|
||||
}
|
||||
|
||||
static struct inode *exofs_nfs_get_inode(struct super_block *sb,
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
static void *exofs_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
{
|
||||
struct exofs_i_info *oi = exofs_i(dentry->d_inode);
|
||||
struct exofs_i_info *oi = exofs_i(d_inode(dentry));
|
||||
|
||||
nd_set_link(nd, (char *)oi->i_data);
|
||||
return NULL;
|
||||
|
||||
Reference in New Issue
Block a user