From: Miklos Szeredi <mszeredi@redhat.com> To: linux-unionfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/39] Revert "Revert "ovl: get_write_access() in truncate"" Date: Tue, 29 May 2018 16:43:11 +0200 [thread overview] Message-ID: <20180529144339.16538-12-mszeredi@redhat.com> (raw) In-Reply-To: <20180529144339.16538-1-mszeredi@redhat.com> This reverts commit 31c3a7069593b072bd57192b63b62f9a7e994e9a. Re-add functionality dealing with i_writecount on truncate to overlayfs. This patch shouldn't have any observable effects, since we just re-assert the writecout that vfs_truncate() already got for us. This is in preparation for moving overlay functionality out of the VFS. Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> --- fs/overlayfs/inode.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index 24fc27683a57..0116ec12451d 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -39,10 +39,27 @@ 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; @@ -53,7 +70,11 @@ 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.14.3
next prev parent reply other threads:[~2018-05-29 14:43 UTC|newest] Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-29 14:43 [PATCH 00/39] overlayfs: stack file operations Miklos Szeredi 2018-05-29 14:43 ` [PATCH 01/39] vfs: dedpue: return loff_t Miklos Szeredi 2018-06-04 8:43 ` Christoph Hellwig 2018-06-05 8:33 ` Miklos Szeredi 2018-06-06 15:09 ` Darrick J. Wong 2018-06-18 20:08 ` Miklos Szeredi 2018-05-29 14:43 ` [PATCH 02/39] vfs: dedupe: rationalize args Miklos Szeredi 2018-06-06 15:02 ` Darrick J. Wong 2018-05-29 14:43 ` [PATCH 03/39] vfs: dedupe: extract helper for a single dedup Miklos Szeredi 2018-05-29 15:41 ` Amir Goldstein 2018-05-29 16:04 ` Amir Goldstein 2018-06-04 8:44 ` Christoph Hellwig 2018-05-29 14:43 ` [PATCH 04/39] vfs: add path_open() Miklos Szeredi 2018-06-04 8:46 ` Christoph Hellwig 2018-06-10 4:36 ` Al Viro 2018-05-29 14:43 ` [PATCH 05/39] vfs: optionally don't account file in nr_files Miklos Szeredi 2018-06-04 8:47 ` Christoph Hellwig 2018-06-04 8:57 ` Miklos Szeredi 2018-06-10 4:41 ` Al Viro 2018-05-29 14:43 ` [PATCH 06/39] vfs: add f_op->pre_mmap() Miklos Szeredi 2018-06-04 8:48 ` Christoph Hellwig 2018-06-05 11:36 ` Miklos Szeredi 2018-05-29 14:43 ` [PATCH 07/39] vfs: export vfs_ioctl() to modules Miklos Szeredi 2018-06-04 8:49 ` Christoph Hellwig 2018-06-10 4:57 ` Al Viro 2018-06-11 7:19 ` Miklos Szeredi 2018-06-11 16:24 ` Christoph Hellwig 2018-06-19 14:04 ` Miklos Szeredi 2018-06-19 14:24 ` Christoph Hellwig 2018-06-19 14:34 ` Miklos Szeredi 2018-06-19 14:54 ` Al Viro 2018-05-29 14:43 ` [PATCH 08/39] vfs: export vfs_dedupe_file_range_one() " Miklos Szeredi 2018-05-29 14:43 ` [PATCH 09/39] ovl: copy up times Miklos Szeredi 2018-05-29 14:43 ` [PATCH 10/39] ovl: copy up inode flags Miklos Szeredi 2018-05-29 14:43 ` Miklos Szeredi [this message] 2018-05-29 14:43 ` [PATCH 12/39] ovl: copy up file size as well Miklos Szeredi 2018-05-29 14:43 ` [PATCH 13/39] ovl: deal with overlay files in ovl_d_real() Miklos Szeredi 2018-05-29 14:43 ` [PATCH 14/39] ovl: stack file ops Miklos Szeredi 2018-06-10 4:13 ` Al Viro 2018-06-11 7:09 ` Miklos Szeredi 2018-06-12 2:29 ` Al Viro 2018-06-12 2:40 ` Al Viro 2018-06-12 9:24 ` Miklos Szeredi 2018-06-12 18:24 ` Al Viro 2018-06-12 18:31 ` Al Viro 2018-06-13 9:21 ` Miklos Szeredi 2018-06-15 5:47 ` Al Viro 2018-06-18 11:50 ` Miklos Szeredi 2018-06-13 11:56 ` J. R. Okajima 2018-05-29 14:43 ` [PATCH 15/39] ovl: add helper to return real file Miklos Szeredi 2018-06-10 5:42 ` Al Viro 2018-06-11 8:11 ` Miklos Szeredi 2018-05-29 14:43 ` [PATCH 16/39] ovl: add ovl_read_iter() Miklos Szeredi 2018-05-29 14:43 ` [PATCH 17/39] ovl: add ovl_write_iter() Miklos Szeredi 2018-05-29 14:43 ` [PATCH 18/39] ovl: add ovl_fsync() Miklos Szeredi 2018-05-29 14:43 ` [PATCH 19/39] ovl: add ovl_mmap() Miklos Szeredi 2018-06-10 5:24 ` Al Viro 2018-06-11 7:58 ` Miklos Szeredi 2018-05-29 14:43 ` [PATCH 20/39] ovl: add ovl_fallocate() Miklos Szeredi 2018-05-29 14:43 ` [PATCH 21/39] ovl: add lsattr/chattr support Miklos Szeredi 2018-05-29 14:43 ` [PATCH 22/39] ovl: add ovl_fiemap() Miklos Szeredi 2018-05-29 14:43 ` [PATCH 23/39] ovl: add O_DIRECT support Miklos Szeredi 2018-06-10 5:31 ` Al Viro 2018-06-11 8:08 ` Miklos Szeredi 2018-05-29 14:43 ` [PATCH 24/39] ovl: add reflink/copyfile/dedup support Miklos Szeredi 2018-05-29 14:43 ` [PATCH 25/39] vfs: don't open real Miklos Szeredi 2018-05-29 14:43 ` [PATCH 26/39] ovl: copy-up on MAP_SHARED Miklos Szeredi 2018-05-29 14:43 ` [PATCH 27/39] ovl: obsolete "check_copy_up" module option Miklos Szeredi 2018-05-29 15:13 ` Amir Goldstein 2018-05-30 8:26 ` Miklos Szeredi 2018-05-29 14:43 ` [PATCH 28/39] ovl: fix documentation of non-standard behavior Miklos Szeredi 2018-05-29 14:43 ` [PATCH 29/39] vfs: simplify dentry_open() Miklos Szeredi 2018-05-29 14:43 ` [PATCH 30/39] Revert "ovl: fix may_write_real() for overlayfs directories" Miklos Szeredi 2018-05-29 14:43 ` [PATCH 31/39] Revert "ovl: don't allow writing ioctl on lower layer" Miklos Szeredi 2018-05-29 14:43 ` [PATCH 32/39] vfs: fix freeze protection in mnt_want_write_file() for overlayfs Miklos Szeredi 2018-06-04 8:50 ` Christoph Hellwig 2018-05-29 14:43 ` [PATCH 33/39] Revert "ovl: fix relatime for directories" Miklos Szeredi 2018-05-29 14:43 ` [PATCH 34/39] Revert "vfs: update ovl inode before relatime check" Miklos Szeredi 2018-05-29 14:43 ` [PATCH 35/39] Revert "vfs: add flags to d_real()" Miklos Szeredi 2018-05-29 14:43 ` [PATCH 36/39] Revert "vfs: do get_write_access() on upper layer of overlayfs" Miklos Szeredi 2018-05-29 14:43 ` [PATCH 37/39] Partially revert "locks: fix file locking on overlayfs" Miklos Szeredi 2018-05-29 14:43 ` [PATCH 38/39] Revert "fsnotify: support overlayfs" Miklos Szeredi 2018-05-29 14:43 ` [PATCH 39/39] vfs: remove open_flags from d_real() Miklos Szeredi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180529144339.16538-12-mszeredi@redhat.com \ --to=mszeredi@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-unionfs@vger.kernel.org \ --subject='Re: [PATCH 11/39] Revert "Revert "ovl: get_write_access() in truncate""' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).