git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ext4: keep existing extra fields when inode expands
[pandora-kernel.git]
/
fs
/
fhandle.c
diff --git
a/fs/fhandle.c
b/fs/fhandle.c
index
6b08864
..
710438a
100644
(file)
--- a/
fs/fhandle.c
+++ b/
fs/fhandle.c
@@
-196,8
+196,9
@@
static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
goto out_err;
}
/* copy the full handle */
goto out_err;
}
/* copy the full handle */
- if (copy_from_user(handle, ufh,
- sizeof(struct file_handle) +
+ *handle = f_handle;
+ if (copy_from_user(&handle->f_handle,
+ &ufh->f_handle,
f_handle.handle_bytes)) {
retval = -EFAULT;
goto out_handle;
f_handle.handle_bytes)) {
retval = -EFAULT;
goto out_handle;
@@
-228,7
+229,7
@@
long do_handle_open(int mountdirfd,
path_put(&path);
return fd;
}
path_put(&path);
return fd;
}
- file = file_open_root(path.dentry, path.mnt, "", open_flag);
+ file = file_open_root(path.dentry, path.mnt, "", open_flag
, 0
);
if (IS_ERR(file)) {
put_unused_fd(fd);
retval = PTR_ERR(file);
if (IS_ERR(file)) {
put_unused_fd(fd);
retval = PTR_ERR(file);