From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Fri, 13 May 2022 23:29:56 +0000 (-0400)
Subject: update bmap patches
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=a6ef60e904e3df989aa9115cb4f6978514875381;p=wrapfs-mgmt.git

update bmap patches
---

diff --git a/bug-fixes/new_bmap.patch b/bug-fixes/new_bmap.patch
index f054320..f3dd7fd 100644
--- 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 2b5f3d1..5368714 100644
--- 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;
 +}
 +