From 669a3520af853a65164d220dd0ada9e6fad6bf9d Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Sun, 1 Jun 2014 16:01:23 -0400 Subject: [PATCH] LU-4416 osd-ldiskfs: remove unused 'optional_mutex' argument osd_ldiskfs_map_inode_pages doesn't actually use the optional_mutex argument. Removing it now makes it easier to integrate the ext4_map_blocks changes. Signed-off-by: Jeff Mahoney Signed-off-by: James Simmons Change-Id: Ic87114b8d7adadf386a0794c2e6ece79c83601b4 Reviewed-on: http://review.whamcloud.com/10162 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Bob Glossman --- lustre/osd-ldiskfs/osd_io.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c index 555b9fc..bbdf111 100644 --- a/lustre/osd-ldiskfs/osd_io.c +++ b/lustre/osd-ldiskfs/osd_io.c @@ -819,7 +819,7 @@ int osd_ldiskfs_map_bm_inode_pages(struct inode *inode, struct page **page, static int osd_ldiskfs_map_inode_pages(struct inode *inode, struct page **page, int pages, unsigned long *blocks, - int create, struct mutex *optional_mutex) + int create) { int rc; @@ -828,11 +828,7 @@ static int osd_ldiskfs_map_inode_pages(struct inode *inode, struct page **page, blocks, create); return rc; } - if (optional_mutex != NULL) - mutex_lock(optional_mutex); rc = osd_ldiskfs_map_bm_inode_pages(inode, page, pages, blocks, create); - if (optional_mutex != NULL) - mutex_unlock(optional_mutex); return rc; } @@ -907,8 +903,7 @@ static int osd_write_prep(const struct lu_env *env, struct dt_object *dt, if (iobuf->dr_npages) { rc = osd_ldiskfs_map_inode_pages(inode, iobuf->dr_pages, iobuf->dr_npages, - iobuf->dr_blocks, - 0, NULL); + iobuf->dr_blocks, 0); if (likely(rc == 0)) { rc = osd_do_bio(osd, inode, iobuf); /* do IO stats for preparation reads */ @@ -1111,8 +1106,7 @@ static int osd_write_commit(const struct lu_env *env, struct dt_object *dt, } else if (iobuf->dr_npages > 0) { rc = osd_ldiskfs_map_inode_pages(inode, iobuf->dr_pages, iobuf->dr_npages, - iobuf->dr_blocks, - 1, NULL); + iobuf->dr_blocks, 1); } else { /* no pages to write, no transno is needed */ thandle->th_local = 1; @@ -1201,8 +1195,7 @@ static int osd_read_prep(const struct lu_env *env, struct dt_object *dt, if (iobuf->dr_npages) { rc = osd_ldiskfs_map_inode_pages(inode, iobuf->dr_pages, iobuf->dr_npages, - iobuf->dr_blocks, - 0, NULL); + iobuf->dr_blocks, 0); rc = osd_do_bio(osd, inode, iobuf); /* IO stats will be done in osd_bufs_put() */ -- 1.8.3.1