From f654a0253c96cae4bad6f50605aa5378c616de41 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Wed, 27 Jul 2016 16:11:01 +0200 Subject: [PATCH] Revert "ovl: get_write_access() in truncate" This reverts commit 03bea60409328de54e4ff7ec41672e12a9cb0908. This is now done in vfs_truncate() by "vfs: do get_write_access() on upper layer of overlayfs". No need to duplicate this in overlayfs. Signed-off-by: Miklos Szeredi --- fs/overlayfs/inode.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index c75625c1efa3..be8b300c000b 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -61,27 +61,10 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr) if (err) goto out; - if (attr->ia_valid & ATTR_SIZE) { - struct inode *realinode = d_inode(ovl_dentry_real(dentry)); - - err = -ETXTBSY; - if (atomic_read(&realinode->i_writecount) < 0) - goto out_drop_write; - } - err = ovl_copy_up(dentry); if (!err) { - struct inode *winode = NULL; - upperdentry = ovl_dentry_upper(dentry); - if (attr->ia_valid & ATTR_SIZE) { - winode = d_inode(upperdentry); - err = get_write_access(winode); - if (err) - goto out_drop_write; - } - if (attr->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID)) attr->ia_valid &= ~ATTR_MODE; @@ -92,11 +75,7 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr) if (!err) ovl_copyattr(upperdentry->d_inode, dentry->d_inode); inode_unlock(upperdentry->d_inode); - - if (winode) - put_write_access(winode); } -out_drop_write: ovl_drop_write(dentry); out: return err; -- 2.34.1