diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 15:42:12 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 15:42:12 -0400 |
| commit | 8f1e71c1e27a65493db6999015065ec1715b3f98 (patch) | |
| tree | a10fabe905d4a2c656868112ad951e37cb7ecbaf | |
| parent | 9b7c3c45c46c6c67ab5bcf4c8a2cd89ffb9fb606 (diff) | |
| download | longterm-queue-4.18-8f1e71c1e27a65493db6999015065ec1715b3f98.tar.gz | |
fuse: drop already applied patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/fuse-fallocate-fix-return-with-locked-inode.patch | 34 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/queue/fuse-fallocate-fix-return-with-locked-inode.patch b/queue/fuse-fallocate-fix-return-with-locked-inode.patch deleted file mode 100644 index e0616bc..0000000 --- a/queue/fuse-fallocate-fix-return-with-locked-inode.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 35d6fcbb7c3e296a52136347346a698a35af3fda Mon Sep 17 00:00:00 2001 -From: Miklos Szeredi <mszeredi@redhat.com> -Date: Mon, 27 May 2019 11:42:07 +0200 -Subject: [PATCH] fuse: fallocate: fix return with locked inode - -commit 35d6fcbb7c3e296a52136347346a698a35af3fda upstream. - -Do the proper cleanup in case the size check fails. - -Tested with xfstests:generic/228 - -Reported-by: kbuild test robot <lkp@intel.com> -Reported-by: Dan Carpenter <dan.carpenter@oracle.com> -Fixes: 0cbade024ba5 ("fuse: honor RLIMIT_FSIZE in fuse_file_fallocate") -Cc: Liu Bo <bo.liu@linux.alibaba.com> -Cc: <stable@vger.kernel.org> # v3.5 -Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> - -diff --git a/fs/fuse/file.c b/fs/fuse/file.c -index 3959f08279e6..143c54f93f2d 100644 ---- a/fs/fuse/file.c -+++ b/fs/fuse/file.c -@@ -3055,7 +3055,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, - offset + length > i_size_read(inode)) { - err = inode_newsize_ok(inode, offset + length); - if (err) -- return err; -+ goto out; - } - - if (!(mode & FALLOC_FL_KEEP_SIZE)) --- -2.9.5 - diff --git a/queue/series b/queue/series index 5cebfaf..d81d55d 100644 --- a/queue/series +++ b/queue/series @@ -100,7 +100,6 @@ rcu-locking-and-unlocking-need-to-always-be-at-least.patch parisc-Use-implicit-space-register-selection-for-loa.patch NFSv4.1-Again-fix-a-race-where-CB_NOTIFY_LOCK-fails-.patch NFSv4.1-Fix-bug-only-first-CB_NOTIFY_LOCK-is-handled.patch -fuse-fallocate-fix-return-with-locked-inode.patch pstore-Remove-needless-lock-during-console-writes.patch pstore-Convert-buf_lock-to-semaphore.patch pstore-Set-tfm-to-NULL-on-free_buf_for_compression.patch |