Skip to contentSkip to conversation

ovl: add O_LARGEFILE flag when copyup files

PATCH Superseded [email protected] 2 participants 2 messages Sep 11, 2015 – Sep 17, 2015 Overlay filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ovl: add O_LARGEFILE flag when copyup files

From: George Wang <[email protected]>

now ovl only use O_RDONLY for lower and O_WRONLY for upper file. But if the file size larger than MAX_NON_LFS(1UL << 31 -1), will suffer -EOVERFLOW. We should add O_LARGEFILE flag to make it work. Following script can reproduct it:

work
truncate: cannot open ‘work/sparse’ for writing: Value too large for defined data type

---
 fs/overlayfs/copy_up.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/overlayfs/copy_up.c +2 -2
index 84d693d..e8ed965 100644
@@ -81,11 +81,11 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)
 	if (len == 0)
 		return 0;
 
-	old_file = ovl_path_open(old, O_RDONLY);
+	old_file = ovl_path_open(old, O_RDONLY | O_LARGEFILE);
 	if (IS_ERR(old_file))
 		return PTR_ERR(old_file);
 
-	new_file = ovl_path_open(new, O_WRONLY);
+	new_file = ovl_path_open(new, O_WRONLY | O_LARGEFILE);
 	if (IS_ERR(new_file)) {
 		error = PTR_ERR(new_file);
 		goto out_fput;
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 7 lines · [email protected] wrote:

From: George Wang <[email protected]>

now ovl only use O_RDONLY for lower and O_WRONLY for upper file. But if the file size larger than MAX_NON_LFS(1UL << 31 -1), will suffer -EOVERFLOW. We should add O_LARGEFILE flag to make it work. Following script can reproduct it:

Quoted 6 lines

work
truncate: cannot open ‘work/sparse’ for writing: Value too large for defined data type

I just produced something that looks very similar. I think it might be better to only add the flag if it's needed in case one of the upper or lower filesystems rejects it.

Also, it might be worth adding an enablement switch.

David
---
commit 0b365f2143939fa30cac8cf6899ff33825a767c9

Author: David Howells <[email protected]>
Date:   Thu Sep 17 17:14:48 2015 +0100

overlayfs: Conditionally use O_LARGEFILE in ovl_copy_up()

Open the lower file with O_LARGEFILE in ovl_copy_up() if the lower file is >= 4GiB in size.

fs/overlayfs/copy_up.c +6 -3
index 84d693d37428..89b4cb3773d7 100644
@@ -76,16 +76,19 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)
 	struct file *new_file;
 	loff_t old_pos = 0;
 	loff_t new_pos = 0;
-	int error = 0;
+	int error = 0, o_flag = 0;
 
 	if (len == 0)
 		return 0;
 
-	old_file = ovl_path_open(old, O_RDONLY);
+	if (i_size_read(d_inode(old->dentry)) > MAX_NON_LFS)
+		o_flag |= O_LARGEFILE;
+	
+	old_file = ovl_path_open(old, o_flag | O_RDONLY);
 	if (IS_ERR(old_file))
 		return PTR_ERR(old_file);
 
-	new_file = ovl_path_open(new, O_WRONLY);
+	new_file = ovl_path_open(new, o_flag | O_WRONLY);
 	if (IS_ERR(new_file)) {
 		error = PTR_ERR(new_file);
 		goto out_fput;