git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fs/splice.c: fix mapping_gfp_mask usage
[safe/jmp/linux-2.6]
/
fs
/
autofs4
/
dev-ioctl.c
diff --git
a/fs/autofs4/dev-ioctl.c
b/fs/autofs4/dev-ioctl.c
index
6704075
..
d29b7f6
100644
(file)
--- a/
fs/autofs4/dev-ioctl.c
+++ b/
fs/autofs4/dev-ioctl.c
@@
-19,10
+19,10
@@
#include <linux/sched.h>
#include <linux/compat.h>
#include <linux/syscalls.h>
#include <linux/sched.h>
#include <linux/compat.h>
#include <linux/syscalls.h>
-#include <linux/smp_lock.h>
#include <linux/magic.h>
#include <linux/dcache.h>
#include <linux/uaccess.h>
#include <linux/magic.h>
#include <linux/dcache.h>
#include <linux/uaccess.h>
+#include <linux/slab.h>
#include "autofs_i.h"
#include "autofs_i.h"
@@
-545,10
+545,9
@@
static int autofs_dev_ioctl_ismountpoint(struct file *fp,
goto out;
devid = new_encode_dev(path.mnt->mnt_sb->s_dev);
err = 0;
goto out;
devid = new_encode_dev(path.mnt->mnt_sb->s_dev);
err = 0;
- if (path.dentry->d_inode &&
- path.mnt->mnt_root == path.dentry) {
+ if (path.mnt->mnt_root == path.dentry) {
err = 1;
err = 1;
- magic = path.
dentry->d_inode->i
_sb->s_magic;
+ magic = path.
mnt->mnt
_sb->s_magic;
}
} else {
dev_t dev = sbi->sb->s_dev;
}
} else {
dev_t dev = sbi->sb->s_dev;
@@
-561,10
+560,8
@@
static int autofs_dev_ioctl_ismountpoint(struct file *fp,
err = have_submounts(path.dentry);
err = have_submounts(path.dentry);
- if (path.mnt->mnt_mountpoint != path.mnt->mnt_root) {
- if (follow_down(&path.mnt, &path.dentry))
- magic = path.mnt->mnt_sb->s_magic;
- }
+ if (follow_down(&path))
+ magic = path.mnt->mnt_sb->s_magic;
}
param->ismountpoint.out.devid = devid;
}
param->ismountpoint.out.devid = devid;