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
/
minix
/
namei.c
diff --git
a/fs/minix/namei.c
b/fs/minix/namei.c
index
b25bca5
..
299bb66
100644
(file)
--- a/
fs/minix/namei.c
+++ b/
fs/minix/namei.c
@@
-6,18
+6,6
@@
#include "minix.h"
#include "minix.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 = minix_add_link(dentry, inode);
static int add_nondir(struct dentry *dentry, struct inode *inode)
{
int err = minix_add_link(dentry, inode);
@@
-25,7
+13,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;
}
@@
-125,7
+113,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;
}
@@
-139,7
+127,7
@@
static int minix_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);
}
@@
-152,7
+140,7
@@
static int minix_mkdir(struct inode * dir, struct dentry *dentry, int mode)
if (dir->i_nlink >= minix_sb(dir->i_sb)->s_link_max)
goto out;
if (dir->i_nlink >= minix_sb(dir->i_sb)->s_link_max)
goto out;
- in
c
_count(dir);
+ in
ode_inc_link
_count(dir);
inode = minix_new_inode(dir, &err);
if (!inode)
inode = minix_new_inode(dir, &err);
if (!inode)
@@
-163,7
+151,7
@@
static int minix_mkdir(struct inode * dir, struct dentry *dentry, int mode)
inode->i_mode |= S_ISGID;
minix_set_inode(inode, 0);
inode->i_mode |= S_ISGID;
minix_set_inode(inode, 0);
- in
c
_count(inode);
+ in
ode_inc_link
_count(inode);
err = minix_make_empty(inode, dir);
if (err)
err = minix_make_empty(inode, dir);
if (err)
@@
-178,11
+166,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;
}
@@
-202,7
+190,7
@@
static int minix_unlink(struct inode * dir, struct dentry *dentry)
goto end_unlink;
inode->i_ctime = dir->i_ctime;
goto end_unlink;
inode->i_ctime = dir->i_ctime;
-
dec
_count(inode);
+
inode_dec_link
_count(inode);
end_unlink:
return err;
}
end_unlink:
return err;
}
@@
-215,8
+203,8
@@
static int minix_rmdir(struct inode * dir, struct dentry *dentry)
if (minix_empty_dir(inode)) {
err = minix_unlink(dir, dentry);
if (!err) {
if (minix_empty_dir(inode)) {
err = minix_unlink(dir, dentry);
if (!err) {
-
dec
_count(dir);
-
dec
_count(inode);
+
inode_dec_link
_count(dir);
+
inode_dec_link
_count(inode);
}
}
return err;
}
}
return err;
@@
-257,34
+245,34
@@
static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
new_de = minix_find_entry(new_dentry, &new_page);
if (!new_de)
goto out_dir;
new_de = minix_find_entry(new_dentry, &new_page);
if (!new_de)
goto out_dir;
- in
c
_count(old_inode);
+ in
ode_inc_link
_count(old_inode);
minix_set_link(new_de, new_page, old_inode);
new_inode->i_ctime = CURRENT_TIME_SEC;
if (dir_de)
minix_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 >= info->s_link_max)
goto out_dir;
}
} else {
if (dir_de) {
err = -EMLINK;
if (new_dir->i_nlink >= info->s_link_max)
goto out_dir;
}
- in
c
_count(old_inode);
+ in
ode_inc_link
_count(old_inode);
err = minix_add_link(new_dentry, old_inode);
if (err) {
err = minix_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);
}
minix_delete_entry(old_de, old_page);
}
minix_delete_entry(old_de, old_page);
-
dec
_count(old_inode);
+
inode_dec_link
_count(old_inode);
if (dir_de) {
minix_set_link(dir_de, dir_page, new_dir);
if (dir_de) {
minix_set_link(dir_de, dir_page, new_dir);
-
dec
_count(old_dir);
+
inode_dec_link
_count(old_dir);
}
return 0;
}
return 0;