On Thu, Feb 15, 2018 at 04:44:31PM +0100, Niklas Cassel wrote:
On Thu, Feb 15, 2018 at 05:02:32PM +0200, Amir Goldstein wrote:
On Thu, Feb 15, 2018 at 4:31 PM, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Hi Niklas,
The conflict resolution of this patch for v4.14 is trivial (just dropping last hunk of inode.c patch), but I no means to test this right now.
Are you able and/or interested to test the attached backport path for stable kernel v4.14?
I have posted an LTP test (inotify07) to test this fix if anyone else is interested in testing: https://github.com/linux-test-project/ltp/pull/246
Thanks, Amir.
Hello Amir,
I have already backported+verified the fix to v4.13 in one of our internal trees.
Like you said, I simply dropped the last hunk of the patch that modfied inode.c, i.e. I simply ignored this hunk of the patch:
@@ -685,7 +702,7 @@ struct inode *ovl_get_inode(struct dentry *dentry, struct dentry *upperdentry, ovl_set_flag(OVL_IMPURE, inode); /* Check for non-merge dir that may have whiteouts */
- if (S_ISDIR(realinode->i_mode)) {
- if (is_dir) { struct ovl_entry *oe = dentry->d_fsdata;
if (((upperdentry && lowerdentry) || oe->numlower > 1) ||
Ok, last hunk dropped, thanks.
greg k-h