소스 검색

ovl: Do not do metadata only copy-up for truncate operation

truncate should copy up full file (and not do metacopy only), otherwise it
will be broken.  For example, use truncate to increase size of a file so
that any read beyong existing size will return null bytes.  If we don't
copy up full file, then we end up opening lower file and read from it only
reads upto the old size (and not new size after truncate).  Hence to avoid
such situations, copy up data as well when file size changes.

So far it was being done by d_real(O_WRONLY) call in truncate() path.  Now
that patch has been reverted.  So force full copy up in ovl_setattr() if
size of file is changing.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Vivek Goyal 7 년 전
부모
커밋
997336f2c3
1개의 변경된 파일8개의 추가작업 그리고 1개의 파일을 삭제
  1. 8 1
      fs/overlayfs/inode.c

+ 8 - 1
fs/overlayfs/inode.c

@@ -19,6 +19,7 @@
 int ovl_setattr(struct dentry *dentry, struct iattr *attr)
 int ovl_setattr(struct dentry *dentry, struct iattr *attr)
 {
 {
 	int err;
 	int err;
+	bool full_copy_up = false;
 	struct dentry *upperdentry;
 	struct dentry *upperdentry;
 	const struct cred *old_cred;
 	const struct cred *old_cred;
 
 
@@ -36,9 +37,15 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr)
 		err = -ETXTBSY;
 		err = -ETXTBSY;
 		if (atomic_read(&realinode->i_writecount) < 0)
 		if (atomic_read(&realinode->i_writecount) < 0)
 			goto out_drop_write;
 			goto out_drop_write;
+
+		/* Truncate should trigger data copy up as well */
+		full_copy_up = true;
 	}
 	}
 
 
-	err = ovl_copy_up(dentry);
+	if (!full_copy_up)
+		err = ovl_copy_up(dentry);
+	else
+		err = ovl_copy_up_with_data(dentry);
 	if (!err) {
 	if (!err) {
 		struct inode *winode = NULL;
 		struct inode *winode = NULL;