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
/
autofs
/
root.c
diff --git
a/fs/autofs/root.c
b/fs/autofs/root.c
index
9cac08d
..
e698c51
100644
(file)
--- a/
fs/autofs/root.c
+++ b/
fs/autofs/root.c
@@
-45,7
+45,7
@@
static int autofs_root_readdir(struct file *filp, void *dirent, filldir_t filldi
struct autofs_dir_ent *ent = NULL;
struct autofs_dirhash *dirhash;
struct autofs_sb_info *sbi;
struct autofs_dir_ent *ent = NULL;
struct autofs_dirhash *dirhash;
struct autofs_sb_info *sbi;
- struct inode * inode = filp->f_dentry->d_inode;
+ struct inode * inode = filp->f_
path.
dentry->d_inode;
off_t onr, nr;
lock_kernel();
off_t onr, nr;
lock_kernel();
@@
-414,7
+414,7
@@
static int autofs_root_rmdir(struct inode *dir, struct dentry *dentry)
dentry->d_time = (unsigned long)(struct autofs_dir_ent *)NULL;
autofs_hash_delete(ent);
dentry->d_time = (unsigned long)(struct autofs_dir_ent *)NULL;
autofs_hash_delete(ent);
- d
ir->i_nlink--
;
+ d
rop_nlink(dir)
;
d_drop(dentry);
unlock_kernel();
d_drop(dentry);
unlock_kernel();
@@
-466,7
+466,7
@@
static int autofs_root_mkdir(struct inode *dir, struct dentry *dentry, int mode)
ent->dentry = dentry;
autofs_hash_insert(dh,ent);
ent->dentry = dentry;
autofs_hash_insert(dh,ent);
-
dir->i_nlink++
;
+
inc_nlink(dir)
;
d_instantiate(dentry, iget(dir->i_sb,ino));
unlock_kernel();
d_instantiate(dentry, iget(dir->i_sb,ino));
unlock_kernel();
@@
-557,7
+557,7
@@
static int autofs_root_ioctl(struct inode *inode, struct file *filp,
case AUTOFS_IOC_SETTIMEOUT:
return autofs_get_set_timeout(sbi, argp);
case AUTOFS_IOC_EXPIRE:
case AUTOFS_IOC_SETTIMEOUT:
return autofs_get_set_timeout(sbi, argp);
case AUTOFS_IOC_EXPIRE:
- return autofs_expire_run(inode->i_sb, sbi, filp->f_
vfs
mnt,
+ return autofs_expire_run(inode->i_sb, sbi, filp->f_
path.
mnt,
argp);
default:
return -ENOSYS;
argp);
default:
return -ENOSYS;