[PATCH 11/20] nilfs2: Remove direct usage of fiemap_extent_info

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



struct fiemap-extent_info will be gone in later patches, remove its direct usage
from nilfs2

Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
---
 fs/nilfs2/inode.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index a8040ed52bd5..88c13f6c13cd 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -994,7 +994,6 @@ void nilfs_dirty_inode(struct inode *inode, int flags)
 
 int nilfs_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
 {
-	struct fiemap_extent_info *fieinfo = f_ctx->fc_data;
 	u64 start = f_ctx->fc_start;
 	u64 len = f_ctx->fc_len;
 	struct the_nilfs *nilfs = inode->i_sb->s_fs_info;
@@ -1029,7 +1028,8 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
 			if (size) {
 				/* End of the current extent */
 				ret = fiemap_fill_next_extent(
-					fieinfo, logical, phys, size, flags);
+					(struct fiemap_extent_info *)f_ctx->fc_data,
+					logical, phys, size, flags);
 				if (ret)
 					break;
 			}
@@ -1079,7 +1079,8 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
 					flags |= FIEMAP_EXTENT_LAST;
 
 				ret = fiemap_fill_next_extent(
-					fieinfo, logical, phys, size, flags);
+					(struct fiemap_extent_info *)f_ctx->fc_data,
+					logical, phys, size, flags);
 				if (ret)
 					break;
 				size = 0;
@@ -1094,8 +1095,8 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
 				} else {
 					/* Terminate the current extent */
 					ret = fiemap_fill_next_extent(
-						fieinfo, logical, phys, size,
-						flags);
+						(struct fiemap_extent_info *)f_ctx->fc_data,
+						logical, phys, size, flags);
 					if (ret || blkoff > end_blkoff)
 						break;
 
-- 
2.17.1




[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [Samba]     [Device Mapper]     [CEPH Development]

  Powered by Linux