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
/
coda
/
dir.c
diff --git
a/fs/coda/dir.c
b/fs/coda/dir.c
index
71f2ea6
..
0c6f7f3
100644
(file)
--- a/
fs/coda/dir.c
+++ b/
fs/coda/dir.c
@@
-304,7
+304,7
@@
static int coda_link(struct dentry *source_de, struct inode *dir_inode,
coda_dir_changed(dir_inode, 0);
atomic_inc(&inode->i_count);
d_instantiate(de, inode);
coda_dir_changed(dir_inode, 0);
atomic_inc(&inode->i_count);
d_instantiate(de, inode);
- in
ode->i_nlink++
;
+ in
c_nlink(inode)
;
out:
unlock_kernel();
out:
unlock_kernel();
@@
-367,7
+367,7
@@
int coda_unlink(struct inode *dir, struct dentry *de)
}
coda_dir_changed(dir, 0);
}
coda_dir_changed(dir, 0);
- d
e->d_inode->i_nlink--
;
+ d
rop_nlink(de->d_inode)
;
unlock_kernel();
return 0;
unlock_kernel();
return 0;
@@
-394,7
+394,7
@@
int coda_rmdir(struct inode *dir, struct dentry *de)
}
coda_dir_changed(dir, -1);
}
coda_dir_changed(dir, -1);
- d
e->d_inode->i_nlink--
;
+ d
rop_nlink(de->d_inode)
;
d_delete(de);
unlock_kernel();
d_delete(de);
unlock_kernel();
@@
-441,7
+441,7
@@
static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
/* file operations for directories */
int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
{
/* file operations for directories */
int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
{
- struct dentry *coda_dentry = coda_file->f_dentry;
+ struct dentry *coda_dentry = coda_file->f_
path.
dentry;
struct coda_file_info *cfi;
struct file *host_file;
struct inode *host_inode;
struct coda_file_info *cfi;
struct file *host_file;
struct inode *host_inode;
@@
-453,7
+453,7
@@
int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
coda_vfs_stat.readdir++;
coda_vfs_stat.readdir++;
- host_inode = host_file->f_dentry->d_inode;
+ host_inode = host_file->f_
path.
dentry->d_inode;
mutex_lock(&host_inode->i_mutex);
host_file->f_pos = coda_file->f_pos;
mutex_lock(&host_inode->i_mutex);
host_file->f_pos = coda_file->f_pos;
@@
-513,7
+513,7
@@
static int coda_venus_readdir(struct file *filp, filldir_t filldir,
ino_t ino;
int ret, i;
ino_t ino;
int ret, i;
- vdir =
(struct venus_dirent *)
kmalloc(sizeof(*vdir), GFP_KERNEL);
+ vdir = kmalloc(sizeof(*vdir), GFP_KERNEL);
if (!vdir) return -ENOMEM;
i = filp->f_pos;
if (!vdir) return -ENOMEM;
i = filp->f_pos;
@@
-544,14
+544,14
@@
static int coda_venus_readdir(struct file *filp, filldir_t filldir,
/* catch truncated reads */
if (ret < vdir_size || ret < vdir_size + vdir->d_namlen) {
printk("coda_venus_readdir: short read: %ld\n",
/* catch truncated reads */
if (ret < vdir_size || ret < vdir_size + vdir->d_namlen) {
printk("coda_venus_readdir: short read: %ld\n",
- filp->f_dentry->d_inode->i_ino);
+ filp->f_
path.
dentry->d_inode->i_ino);
ret = -EBADF;
break;
}
/* validate whether the directory file actually makes sense */
if (vdir->d_reclen < vdir_size + vdir->d_namlen) {
printk("coda_venus_readdir: Invalid dir: %ld\n",
ret = -EBADF;
break;
}
/* validate whether the directory file actually makes sense */
if (vdir->d_reclen < vdir_size + vdir->d_namlen) {
printk("coda_venus_readdir: Invalid dir: %ld\n",
- filp->f_dentry->d_inode->i_ino);
+ filp->f_
path.
dentry->d_inode->i_ino);
ret = -EBADF;
break;
}
ret = -EBADF;
break;
}