git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
sysv
/
namei.c
diff --git
a/fs/sysv/namei.c
b/fs/sysv/namei.c
index
7f0e4b5
..
f7c08db
100644
(file)
--- a/
fs/sysv/namei.c
+++ b/
fs/sysv/namei.c
@@
-16,18
+16,6
@@
#include <linux/smp_lock.h>
#include "sysv.h"
#include <linux/smp_lock.h>
#include "sysv.h"
-static inline void inc_count(struct inode *inode)
-{
- inode->i_nlink++;
- mark_inode_dirty(inode);
-}
-
-static inline void dec_count(struct inode *inode)
-{
- inode->i_nlink--;
- mark_inode_dirty(inode);
-}
-
static int add_nondir(struct dentry *dentry, struct inode *inode)
{
int err = sysv_add_link(dentry, inode);
static int add_nondir(struct dentry *dentry, struct inode *inode)
{
int err = sysv_add_link(dentry, inode);
@@
-35,7
+23,7
@@
static int add_nondir(struct dentry *dentry, struct inode *inode)
d_instantiate(dentry, inode);
return 0;
}
d_instantiate(dentry, inode);
return 0;
}
-
dec
_count(inode);
+
inode_dec_link
_count(inode);
iput(inode);
return err;
}
iput(inode);
return err;
}
@@
-124,7
+112,7
@@
out:
return err;
out_fail:
return err;
out_fail:
-
dec
_count(inode);
+
inode_dec_link
_count(inode);
iput(inode);
goto out;
}
iput(inode);
goto out;
}
@@
-138,7
+126,7
@@
static int sysv_link(struct dentry * old_dentry, struct inode * dir,
return -EMLINK;
inode->i_ctime = CURRENT_TIME_SEC;
return -EMLINK;
inode->i_ctime = CURRENT_TIME_SEC;
- in
c
_count(inode);
+ in
ode_inc_link
_count(inode);
atomic_inc(&inode->i_count);
return add_nondir(dentry, inode);
atomic_inc(&inode->i_count);
return add_nondir(dentry, inode);
@@
-151,7
+139,7
@@
static int sysv_mkdir(struct inode * dir, struct dentry *dentry, int mode)
if (dir->i_nlink >= SYSV_SB(dir->i_sb)->s_link_max)
goto out;
if (dir->i_nlink >= SYSV_SB(dir->i_sb)->s_link_max)
goto out;
- in
c
_count(dir);
+ in
ode_inc_link
_count(dir);
inode = sysv_new_inode(dir, S_IFDIR|mode);
err = PTR_ERR(inode);
inode = sysv_new_inode(dir, S_IFDIR|mode);
err = PTR_ERR(inode);
@@
-160,7
+148,7
@@
static int sysv_mkdir(struct inode * dir, struct dentry *dentry, int mode)
sysv_set_inode(inode, 0);
sysv_set_inode(inode, 0);
- in
c
_count(inode);
+ in
ode_inc_link
_count(inode);
err = sysv_make_empty(inode, dir);
if (err)
err = sysv_make_empty(inode, dir);
if (err)
@@
-175,11
+163,11
@@
out:
return err;
out_fail:
return err;
out_fail:
-
dec
_count(inode);
-
dec
_count(inode);
+
inode_dec_link
_count(inode);
+
inode_dec_link
_count(inode);
iput(inode);
out_dir:
iput(inode);
out_dir:
-
dec
_count(dir);
+
inode_dec_link
_count(dir);
goto out;
}
goto out;
}
@@
-199,7
+187,7
@@
static int sysv_unlink(struct inode * dir, struct dentry * dentry)
goto out;
inode->i_ctime = dir->i_ctime;
goto out;
inode->i_ctime = dir->i_ctime;
-
dec
_count(inode);
+
inode_dec_link
_count(inode);
out:
return err;
}
out:
return err;
}
@@
-213,8
+201,8
@@
static int sysv_rmdir(struct inode * dir, struct dentry * dentry)
err = sysv_unlink(dir, dentry);
if (!err) {
inode->i_size = 0;
err = sysv_unlink(dir, dentry);
if (!err) {
inode->i_size = 0;
-
dec
_count(inode);
-
dec
_count(dir);
+
inode_dec_link
_count(inode);
+
inode_dec_link
_count(dir);
}
}
return err;
}
}
return err;
@@
-258,34
+246,34
@@
static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry,
new_de = sysv_find_entry(new_dentry, &new_page);
if (!new_de)
goto out_dir;
new_de = sysv_find_entry(new_dentry, &new_page);
if (!new_de)
goto out_dir;
- in
c
_count(old_inode);
+ in
ode_inc_link
_count(old_inode);
sysv_set_link(new_de, new_page, old_inode);
new_inode->i_ctime = CURRENT_TIME_SEC;
if (dir_de)
sysv_set_link(new_de, new_page, old_inode);
new_inode->i_ctime = CURRENT_TIME_SEC;
if (dir_de)
-
new_inode->i_nlink--
;
-
dec
_count(new_inode);
+
drop_nlink(new_inode)
;
+
inode_dec_link
_count(new_inode);
} else {
if (dir_de) {
err = -EMLINK;
if (new_dir->i_nlink >= SYSV_SB(new_dir->i_sb)->s_link_max)
goto out_dir;
}
} else {
if (dir_de) {
err = -EMLINK;
if (new_dir->i_nlink >= SYSV_SB(new_dir->i_sb)->s_link_max)
goto out_dir;
}
- in
c
_count(old_inode);
+ in
ode_inc_link
_count(old_inode);
err = sysv_add_link(new_dentry, old_inode);
if (err) {
err = sysv_add_link(new_dentry, old_inode);
if (err) {
-
dec
_count(old_inode);
+
inode_dec_link
_count(old_inode);
goto out_dir;
}
if (dir_de)
goto out_dir;
}
if (dir_de)
- in
c
_count(new_dir);
+ in
ode_inc_link
_count(new_dir);
}
sysv_delete_entry(old_de, old_page);
}
sysv_delete_entry(old_de, old_page);
-
dec
_count(old_inode);
+
inode_dec_link
_count(old_inode);
if (dir_de) {
sysv_set_link(dir_de, dir_page, new_dir);
if (dir_de) {
sysv_set_link(dir_de, dir_page, new_dir);
-
dec
_count(old_dir);
+
inode_dec_link
_count(old_dir);
}
return 0;
}
return 0;