mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -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
|
|
@ -309,7 +309,7 @@ void fat_truncate_blocks(struct inode *inode, loff_t offset)
|
|||
|
||||
int fat_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
generic_fillattr(inode, stat);
|
||||
stat->blksize = MSDOS_SB(inode->i_sb)->cluster_size;
|
||||
|
||||
|
|
@ -381,7 +381,7 @@ static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode)
|
|||
int fat_setattr(struct dentry *dentry, struct iattr *attr)
|
||||
{
|
||||
struct msdos_sb_info *sbi = MSDOS_SB(dentry->d_sb);
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
unsigned int ia_valid;
|
||||
int error;
|
||||
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ out:
|
|||
static int msdos_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
struct fat_slot_info sinfo;
|
||||
int err;
|
||||
|
||||
|
|
@ -404,7 +404,7 @@ out:
|
|||
/***** Unlink a file */
|
||||
static int msdos_unlink(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct fat_slot_info sinfo;
|
||||
int err;
|
||||
|
|
@ -442,8 +442,8 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
|
|||
int err, old_attrs, is_dir, update_dotdot, corrupt = 0;
|
||||
|
||||
old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
|
||||
old_inode = old_dentry->d_inode;
|
||||
new_inode = new_dentry->d_inode;
|
||||
old_inode = d_inode(old_dentry);
|
||||
new_inode = d_inode(new_dentry);
|
||||
|
||||
err = fat_scan(old_dir, old_name, &old_sinfo);
|
||||
if (err) {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ static int vfat_revalidate_shortname(struct dentry *dentry)
|
|||
{
|
||||
int ret = 1;
|
||||
spin_lock(&dentry->d_lock);
|
||||
if (dentry->d_time != dentry->d_parent->d_inode->i_version)
|
||||
if (dentry->d_time != d_inode(dentry->d_parent)->i_version)
|
||||
ret = 0;
|
||||
spin_unlock(&dentry->d_lock);
|
||||
return ret;
|
||||
|
|
@ -47,7 +47,7 @@ static int vfat_revalidate(struct dentry *dentry, unsigned int flags)
|
|||
return -ECHILD;
|
||||
|
||||
/* This is not negative dentry. Always valid. */
|
||||
if (dentry->d_inode)
|
||||
if (d_really_is_positive(dentry))
|
||||
return 1;
|
||||
return vfat_revalidate_shortname(dentry);
|
||||
}
|
||||
|
|
@ -67,7 +67,7 @@ static int vfat_revalidate_ci(struct dentry *dentry, unsigned int flags)
|
|||
* positive dentry isn't good idea. So it's unsupported like
|
||||
* rename("filename", "FILENAME") for now.
|
||||
*/
|
||||
if (dentry->d_inode)
|
||||
if (d_really_is_positive(dentry))
|
||||
return 1;
|
||||
|
||||
/*
|
||||
|
|
@ -803,7 +803,7 @@ out:
|
|||
|
||||
static int vfat_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct fat_slot_info sinfo;
|
||||
int err;
|
||||
|
|
@ -834,7 +834,7 @@ out:
|
|||
|
||||
static int vfat_unlink(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct fat_slot_info sinfo;
|
||||
int err;
|
||||
|
|
@ -917,8 +917,8 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
struct super_block *sb = old_dir->i_sb;
|
||||
|
||||
old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
|
||||
old_inode = old_dentry->d_inode;
|
||||
new_inode = new_dentry->d_inode;
|
||||
old_inode = d_inode(old_dentry);
|
||||
new_inode = d_inode(new_dentry);
|
||||
mutex_lock(&MSDOS_SB(sb)->s_lock);
|
||||
err = vfat_find(old_dir, &old_dentry->d_name, &old_sinfo);
|
||||
if (err)
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ struct inode *fat_rebuild_parent(struct super_block *sb, int parent_logstart)
|
|||
* Find the parent for a directory that is not currently connected to
|
||||
* the filesystem root.
|
||||
*
|
||||
* On entry, the caller holds child_dir->d_inode->i_mutex.
|
||||
* On entry, the caller holds d_inode(child_dir)->i_mutex.
|
||||
*/
|
||||
static struct dentry *fat_get_parent(struct dentry *child_dir)
|
||||
{
|
||||
|
|
@ -276,7 +276,7 @@ static struct dentry *fat_get_parent(struct dentry *child_dir)
|
|||
struct inode *parent_inode = NULL;
|
||||
struct msdos_sb_info *sbi = MSDOS_SB(sb);
|
||||
|
||||
if (!fat_get_dotdot_entry(child_dir->d_inode, &bh, &de)) {
|
||||
if (!fat_get_dotdot_entry(d_inode(child_dir), &bh, &de)) {
|
||||
int parent_logstart = fat_get_start(sbi, de);
|
||||
parent_inode = fat_dget(sb, parent_logstart);
|
||||
if (!parent_inode && sbi->options.nfs == FAT_NFS_NOSTALE_RO)
|
||||
|
|
|
|||
Loading…
Reference in a new issue