mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[PATCH] ufs: switch to inode_inc_count, inode_dec_count 

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alexey Dobriyan 2006-03-23 03:00:53 -08:00 committed by Linus Torvalds
parent a513b035ea
commit 3257545e40
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
fs/ufs/namei.c
View File

@ -43,18 +43,6 @@
#define UFSD(x)
#endif
static inline void ufs_inc_count(struct inode *inode)
{
inode->i_nlink++;
mark_inode_dirty(inode);
}
static inline void ufs_dec_count(struct inode *inode)
{
inode->i_nlink--;
mark_inode_dirty(inode);
}
static inline int ufs_add_nondir(struct dentry *dentry, struct inode *inode)
{
int err = ufs_add_link(dentry, inode);
@ -62,7 +50,7 @@ static inline int ufs_add_nondir(struct dentry *dentry, struct inode *inode)
d_instantiate(dentry, inode);
return 0;
}
ufs_dec_count(inode);
inode_dec_link_count(inode);
iput(inode);
return err;
}
@ -173,7 +161,7 @@ out:
return err;
out_fail:
ufs_dec_count(inode);
inode_dec_link_count(inode);
iput(inode);
goto out;
}
@ -191,7 +179,7 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
}
inode->i_ctime = CURRENT_TIME_SEC;
ufs_inc_count(inode);
inode_inc_link_count(inode);
atomic_inc(&inode->i_count);
error = ufs_add_nondir(dentry, inode);
@ -208,7 +196,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, int mode)
goto out;
lock_kernel();
ufs_inc_count(dir);
inode_inc_link_count(dir);
inode = ufs_new_inode(dir, S_IFDIR|mode);
err = PTR_ERR(inode);
@ -218,7 +206,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, int mode)
inode->i_op = &ufs_dir_inode_operations;
inode->i_fop = &ufs_dir_operations;
ufs_inc_count(inode);
inode_inc_link_count(inode);
err = ufs_make_empty(inode, dir);
if (err)
@ -234,11 +222,11 @@ out:
return err;
out_fail:
ufs_dec_count(inode);
ufs_dec_count(inode);
inode_dec_link_count(inode);
inode_dec_link_count(inode);
iput (inode);
out_dir:
ufs_dec_count(dir);
inode_dec_link_count(dir);
unlock_kernel();
goto out;
}
@ -260,7 +248,7 @@ static int ufs_unlink(struct inode * dir, struct dentry *dentry)
goto out;
inode->i_ctime = dir->i_ctime;
ufs_dec_count(inode);
inode_dec_link_count(inode);
err = 0;
out:
unlock_kernel();
@ -277,8 +265,8 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
err = ufs_unlink(dir, dentry);
if (!err) {
inode->i_size = 0;
ufs_dec_count(inode);
ufs_dec_count(dir);
inode_dec_link_count(inode);
inode_dec_link_count(dir);
}
}
unlock_kernel();
@ -319,35 +307,35 @@ static int ufs_rename (struct inode * old_dir, struct dentry * old_dentry,
new_de = ufs_find_entry (new_dentry, &new_bh);
if (!new_de)
goto out_dir;
ufs_inc_count(old_inode);
inode_inc_link_count(old_inode);
ufs_set_link(new_dir, new_de, new_bh, old_inode);
new_inode->i_ctime = CURRENT_TIME_SEC;
if (dir_de)
new_inode->i_nlink--;
ufs_dec_count(new_inode);
inode_dec_link_count(new_inode);
} else {
if (dir_de) {
err = -EMLINK;
if (new_dir->i_nlink >= UFS_LINK_MAX)
goto out_dir;
}
ufs_inc_count(old_inode);
inode_inc_link_count(old_inode);
err = ufs_add_link(new_dentry, old_inode);
if (err) {
ufs_dec_count(old_inode);
inode_dec_link_count(old_inode);
goto out_dir;
}
if (dir_de)
ufs_inc_count(new_dir);
inode_inc_link_count(new_dir);
}
ufs_delete_entry (old_dir, old_de, old_bh);
ufs_dec_count(old_inode);
inode_dec_link_count(old_inode);
if (dir_de) {
ufs_set_link(old_inode, dir_de, dir_bh, new_dir);
ufs_dec_count(old_dir);
inode_dec_link_count(old_dir);
}
unlock_kernel();
return 0;