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
/
qnx4
/
namei.c
diff --git
a/fs/qnx4/namei.c
b/fs/qnx4/namei.c
index
4af4951
..
733cdf0
100644
(file)
--- a/
fs/qnx4/namei.c
+++ b/
fs/qnx4/namei.c
@@
-12,7
+12,6
@@
* 04-07-1998 by Frank Denis : first step for rmdir/unlink.
*/
* 04-07-1998 by Frank Denis : first step for rmdir/unlink.
*/
-#include <linux/config.h>
#include <linux/time.h>
#include <linux/fs.h>
#include <linux/qnx4_fs.h>
#include <linux/time.h>
#include <linux/fs.h>
#include <linux/qnx4_fs.h>
@@
-187,11
+186,10
@@
int qnx4_rmdir(struct inode *dir, struct dentry *dentry)
memset(de->di_fname, 0, sizeof de->di_fname);
de->di_mode = 0;
mark_buffer_dirty(bh);
memset(de->di_fname, 0, sizeof de->di_fname);
de->di_mode = 0;
mark_buffer_dirty(bh);
-
inode->i_nlink = 0
;
+
clear_nlink(inode)
;
mark_inode_dirty(inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
mark_inode_dirty(inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
- dir->i_nlink--;
- mark_inode_dirty(dir);
+ inode_dec_link_count(dir);
retval = 0;
end_rmdir:
retval = 0;
end_rmdir:
@@
-235,9
+233,8
@@
int qnx4_unlink(struct inode *dir, struct dentry *dentry)
mark_buffer_dirty(bh);
dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
mark_inode_dirty(dir);
mark_buffer_dirty(bh);
dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
mark_inode_dirty(dir);
- inode->i_nlink--;
inode->i_ctime = dir->i_ctime;
inode->i_ctime = dir->i_ctime;
-
mark_inode_dirty
(inode);
+
inode_dec_link_count
(inode);
retval = 0;
end_unlink:
retval = 0;
end_unlink: