projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] md: define raid5_mergeable_bvec
[powerpc.git]
/
fs
/
compat.c
diff --git
a/fs/compat.c
b/fs/compat.c
index
a7e3f16
..
b766964
100644
(file)
--- a/
fs/compat.c
+++ b/
fs/compat.c
@@
-232,7
+232,7
@@
asmlinkage long compat_sys_fstatfs(unsigned int fd, struct compat_statfs __user
file = fget(fd);
if (!file)
goto out;
file = fget(fd);
if (!file)
goto out;
- error = vfs_statfs(file->f_dentry, &tmp);
+ error = vfs_statfs(file->f_
path.
dentry, &tmp);
if (!error)
error = put_compat_statfs(buf, &tmp);
fput(file);
if (!error)
error = put_compat_statfs(buf, &tmp);
fput(file);
@@
-303,7
+303,7
@@
asmlinkage long compat_sys_fstatfs64(unsigned int fd, compat_size_t sz, struct c
file = fget(fd);
if (!file)
goto out;
file = fget(fd);
if (!file)
goto out;
- error = vfs_statfs(file->f_dentry, &tmp);
+ error = vfs_statfs(file->f_
path.
dentry, &tmp);
if (!error)
error = put_compat_statfs64(buf, &tmp);
fput(file);
if (!error)
error = put_compat_statfs64(buf, &tmp);
fput(file);
@@
-365,7
+365,7
@@
static void compat_ioctl_error(struct file *filp, unsigned int fd,
/* find the name of the device. */
path = (char *)__get_free_page(GFP_KERNEL);
if (path) {
/* find the name of the device. */
path = (char *)__get_free_page(GFP_KERNEL);
if (path) {
- fn = d_path(filp->f_
dentry, filp->f_vfs
mnt, path, PAGE_SIZE);
+ fn = d_path(filp->f_
path.dentry, filp->f_path.
mnt, path, PAGE_SIZE);
if (IS_ERR(fn))
fn = "?";
}
if (IS_ERR(fn))
fn = "?";
}
@@
-416,7
+416,7
@@
asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
case FIBMAP:
case FIGETBSZ:
case FIONREAD:
case FIBMAP:
case FIGETBSZ:
case FIONREAD:
- if (S_ISREG(filp->f_dentry->d_inode->i_mode))
+ if (S_ISREG(filp->f_
path.
dentry->d_inode->i_mode))
break;
/*FALL THROUGH*/
break;
/*FALL THROUGH*/
@@
-438,7
+438,7
@@
asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
goto found_handler;
}
goto found_handler;
}
- if (S_ISSOCK(filp->f_dentry->d_inode->i_mode) &&
+ if (S_ISSOCK(filp->f_
path.
dentry->d_inode->i_mode) &&
cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) {
error = siocdevprivate_ioctl(fd, cmd, arg);
} else {
cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) {
error = siocdevprivate_ioctl(fd, cmd, arg);
} else {
@@
-1259,7
+1259,7
@@
out:
if (iov != iovstack)
kfree(iov);
if ((ret + (type == READ)) > 0) {
if (iov != iovstack)
kfree(iov);
if ((ret + (type == READ)) > 0) {
- struct dentry *dentry = file->f_dentry;
+ struct dentry *dentry = file->f_
path.
dentry;
if (type == READ)
fsnotify_access(dentry);
else
if (type == READ)
fsnotify_access(dentry);
else