diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-11-10 02:26:19 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-11-10 11:32:17 +0000 |
| commit | 7f79eccf5e552c2ceb24725a278a2ae7e7e761a4 (patch) | |
| tree | 5fe3706ce8bcbb3d6be37df766ee6ae52446c1c5 /debian/patches | |
| parent | ef1fd62260fd74bd9749f2249d19bb79807ee197 (diff) | |
Update to 4.2.6
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/bugfix/all/ovl-conditionally-use-o_largefile-in-ovl_copy_up.patch | 43 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 44 deletions
diff --git a/debian/patches/bugfix/all/ovl-conditionally-use-o_largefile-in-ovl_copy_up.patch b/debian/patches/bugfix/all/ovl-conditionally-use-o_largefile-in-ovl_copy_up.patch deleted file mode 100644 index 96d3bb799..000000000 --- a/debian/patches/bugfix/all/ovl-conditionally-use-o_largefile-in-ovl_copy_up.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: David Howells <dhowells@redhat.com> -Date: Fri, 18 Sep 2015 11:45:12 +0100 -Subject: ovl: conditionally use O_LARGEFILE in ovl_copy_up() -Origin: https://git.kernel.org/cgit/linux/kernel/git/mszeredi/vfs.git/commit?id=bb00c2cd01c27e037900a28dcd01b00317a42fdb - -Open the lower file with O_LARGEFILE in ovl_copy_up() if the lower file -is >= 4GiB in size. - -Reported-by: Ulrich Obergfell <uobergfe@redhat.com> -Signed-off-by: David Howells <dhowells@redhat.com> -Signed-off-by: Miklos Szeredi <miklos@szeredi.hu> -Cc: <stable@vger.kernel.org> # v3.18+ ---- - fs/overlayfs/copy_up.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c -index 84d693d..391c359 100644 ---- a/fs/overlayfs/copy_up.c -+++ b/fs/overlayfs/copy_up.c -@@ -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; diff --git a/debian/patches/series b/debian/patches/series index e22ac4a47..14939bfef 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -91,7 +91,6 @@ bugfix/all/dcache-reduce-the-scope-of-i_lock-in-d_splice_alias.patch bugfix/all/rds-verify-the-underlying-transport-exists-before-cr.patch bugfix/all/media-uvcvideo-disable-hardware-timestamps-by-defaul.patch bugfix/mips/mips-pgtable-bits.h-correct-_page_global_shift-build.patch -bugfix/all/ovl-conditionally-use-o_largefile-in-ovl_copy_up.patch features/all/ath10k-add-qca6164-support.patch debian/block-fix-abi-change-in-4.2.2.patch bugfix/all/nbd-fix-timeout-detection.patch |