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
/
bfs
/
dir.c
diff --git
a/fs/bfs/dir.c
b/fs/bfs/dir.c
index
dcf04cb
..
2a746e6
100644
(file)
--- a/
fs/bfs/dir.c
+++ b/
fs/bfs/dir.c
@@
-27,7
+27,7
@@
static struct buffer_head * bfs_find_entry(struct inode * dir,
static int bfs_readdir(struct file * f, void * dirent, filldir_t filldir)
{
static int bfs_readdir(struct file * f, void * dirent, filldir_t filldir)
{
- struct inode * dir = f->f_dentry->d_inode;
+ struct inode * dir = f->f_
path.
dentry->d_inode;
struct buffer_head * bh;
struct bfs_dirent * de;
unsigned int offset;
struct buffer_head * bh;
struct bfs_dirent * de;
unsigned int offset;
@@
-117,8
+117,7
@@
static int bfs_create(struct inode * dir, struct dentry * dentry, int mode,
err = bfs_add_entry(dir, dentry->d_name.name, dentry->d_name.len, inode->i_ino);
if (err) {
err = bfs_add_entry(dir, dentry->d_name.name, dentry->d_name.len, inode->i_ino);
if (err) {
- inode->i_nlink--;
- mark_inode_dirty(inode);
+ inode_dec_link_count(inode);
iput(inode);
unlock_kernel();
return err;
iput(inode);
unlock_kernel();
return err;
@@
-164,7
+163,7
@@
static int bfs_link(struct dentry * old, struct inode * dir, struct dentry * new
unlock_kernel();
return err;
}
unlock_kernel();
return err;
}
- in
ode->i_nlink++
;
+ in
c_nlink(inode)
;
inode->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(inode);
atomic_inc(&inode->i_count);
inode->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(inode);
atomic_inc(&inode->i_count);
@@
-196,9
+195,8
@@
static int bfs_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);
error = 0;
out_brelse:
error = 0;
out_brelse:
@@
-249,9
+247,8
@@
static int bfs_rename(struct inode * old_dir, struct dentry * old_dentry,
old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME_SEC;
mark_inode_dirty(old_dir);
if (new_inode) {
old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME_SEC;
mark_inode_dirty(old_dir);
if (new_inode) {
- new_inode->i_nlink--;
new_inode->i_ctime = CURRENT_TIME_SEC;
new_inode->i_ctime = CURRENT_TIME_SEC;
-
mark_inode_dirty
(new_inode);
+
inode_dec_link_count
(new_inode);
}
mark_buffer_dirty(old_bh);
error = 0;
}
mark_buffer_dirty(old_bh);
error = 0;