update bmap patches

diff --git a/bug-fixes/new_bmap.patch b/bug-fixes/new_bmap.patch
index f054320d1f3a20db57423d66a57aea62bbdd997e..f3dd7fd75ae8317586ff887e243ebcf6546f9550 100644 (file)
--- a/bug-fixes/new_bmap.patch
+++ b/bug-fixes/new_bmap.patch
@@ -9,9 +9,9 @@ index 9897fa585b97..3eea96f41deb 100644
 +static sector_t wrapfs_bmap(struct address_space *mapping, sector_t block)
 +{
 +      struct inode *lower_inode = wrapfs_lower_inode(mapping->host);
-+      int ret = bmap(lower_inode, &block);
++      int err = bmap(lower_inode, &block);
 +
-+      if (ret)
++      if (err)
 +              return 0;
 +      return block;
 +}

diff --git a/bug-fixes/old_bmap.patch b/bug-fixes/old_bmap.patch
index 2b5f3d18b7dfc301b80699ba0662358092fe34be..5368714f3f764ef705e6869008539d53237ef6cc 100644 (file)
--- a/bug-fixes/old_bmap.patch
+++ b/bug-fixes/old_bmap.patch
@@ -1,33 +1,22 @@
 diff --git a/fs/wrapfs/mmap.c b/fs/wrapfs/mmap.c
-index 9897fa585b97..fbf855c94ea7 100644
+index 9897fa585b97..83a7e329fccd 100644
 --- a/fs/wrapfs/mmap.c
 +++ b/fs/wrapfs/mmap.c
-@@ -1,9 +1,9 @@
- // SPDX-License-Identifier: GPL-2.0-only
- /*
-  * Copyright (c) 1998-2022 Erez Zadok
-- * Copyright (c) 2009    Shrikar Archak
-+ * Copyright (c) 2009    Shrikar Aerrhak
-  * Copyright (c) 2003-2022 Stony Brook University
-- * Copyright (c) 2003-2022 The Research Foundation of SUNY
-+ * Copyright (c) 2003-2022 The Reseaerrh Foundation of SUNY
-  */
- 
- #include "wrapfs.h"
-@@ -84,8 +84,22 @@ static ssize_t wrapfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
+@@ -84,8 +84,23 @@ static ssize_t wrapfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
        return -EINVAL;
  }
  
 +static sector_t wrapfs_bmap(struct address_space *mapping, sector_t block)
 +{
-+      int err = -EINVAL;
++      int err = 0;
 +      struct inode *inode;
 +      struct inode *lower_inode;
 +
 +      inode = (struct inode *) mapping->host;
 +      lower_inode = wrapfs_lower_inode(inode);
 +      if (lower_inode->i_mapping->a_ops->bmap)
-+              err = lower_inode->i_mapping->a_ops->bmap(lower_inode->i_mapping, block);
++              err = lower_inode->i_mapping->a_ops->bmap(lower_inode->i_mapping,
++                                                        block);
 +      return err;
 +}
 +