projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[cascardo/linux.git]
/
fs
/
overlayfs
/
inode.c
diff --git
a/fs/overlayfs/inode.c
b/fs/overlayfs/inode.c
index
bc6d261
..
c58f01b
100644
(file)
--- a/
fs/overlayfs/inode.c
+++ b/
fs/overlayfs/inode.c
@@
-56,7
+56,7
@@
int ovl_setattr(struct dentry *dentry, struct iattr *attr)
* inode_newsize_ok() will always check against MAX_LFS_FILESIZE and not
* check for a swapfile (which this won't be anyway).
*/
* inode_newsize_ok() will always check against MAX_LFS_FILESIZE and not
* check for a swapfile (which this won't be anyway).
*/
- err =
inode_change_ok(dentry->d_inode
, attr);
+ err =
setattr_prepare(dentry
, attr);
if (err)
return err;
if (err)
return err;
@@
-343,10
+343,7
@@
static const struct inode_operations ovl_file_inode_operations = {
.setattr = ovl_setattr,
.permission = ovl_permission,
.getattr = ovl_getattr,
.setattr = ovl_setattr,
.permission = ovl_permission,
.getattr = ovl_getattr,
- .setxattr = generic_setxattr,
- .getxattr = generic_getxattr,
.listxattr = ovl_listxattr,
.listxattr = ovl_listxattr,
- .removexattr = generic_removexattr,
.get_acl = ovl_get_acl,
.update_time = ovl_update_time,
};
.get_acl = ovl_get_acl,
.update_time = ovl_update_time,
};
@@
-356,10
+353,7
@@
static const struct inode_operations ovl_symlink_inode_operations = {
.get_link = ovl_get_link,
.readlink = generic_readlink,
.getattr = ovl_getattr,
.get_link = ovl_get_link,
.readlink = generic_readlink,
.getattr = ovl_getattr,
- .setxattr = generic_setxattr,
- .getxattr = generic_getxattr,
.listxattr = ovl_listxattr,
.listxattr = ovl_listxattr,
- .removexattr = generic_removexattr,
.update_time = ovl_update_time,
};
.update_time = ovl_update_time,
};