From: green@linuxhacker.ru
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Oleg Drokin <green@linuxhacker.ru>,
Oleg Drokin <oleg.drokin@intel.com>
Subject: [PATCH 02/13] staging/lustre: get rid of cfs_bio_* compat macroses
Date: Thu, 30 Jul 2015 18:27:53 -0400 [thread overview]
Message-ID: <1438295284-2307773-3-git-send-email-green@linuxhacker.ru> (raw)
In-Reply-To: <1438295284-2307773-1-git-send-email-green@linuxhacker.ru>
From: Oleg Drokin <green@linuxhacker.ru>
This replaces cfs_bio_io_error with direct calls to bio_io_error
and cfs_bio_end_io with bio_end_io
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
---
drivers/staging/lustre/lustre/include/linux/lustre_compat25.h | 4 ----
drivers/staging/lustre/lustre/llite/lloop.c | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index 622bc93..e7d57e8 100644
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -74,10 +74,6 @@
#define FS_HAS_FIEMAP (0)
#endif
-#define cfs_bio_io_error(a, b) bio_io_error((a))
-#define cfs_bio_endio(a, b, c) bio_endio((a), (c))
-
-
#ifndef SLAB_DESTROY_BY_RCU
#define SLAB_DESTROY_BY_RCU 0
#endif
diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index cc00fd1..56938d2 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -365,7 +365,7 @@ static void loop_make_request(struct request_queue *q, struct bio *old_bio)
loop_add_bio(lo, old_bio);
return;
err:
- cfs_bio_io_error(old_bio, old_bio->bi_iter.bi_size);
+ bio_io_error(old_bio);
}
@@ -376,7 +376,7 @@ static inline void loop_handle_bio(struct lloop_device *lo, struct bio *bio)
while (bio) {
struct bio *tmp = bio->bi_next;
bio->bi_next = NULL;
- cfs_bio_endio(bio, bio->bi_iter.bi_size, ret);
+ bio_endio(bio, ret);
bio = tmp;
}
}
--
2.1.0
next prev parent reply other threads:[~2015-07-30 22:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-30 22:27 [PATCH 00/13] Removal of lustre compat macros green
2015-07-30 22:27 ` [PATCH 01/13] staging/lustre: Remove unused ll_vfs_* compat defines green
2015-07-30 22:27 ` green [this message]
2015-07-30 22:27 ` [PATCH 03/13] staging/lustre: Drop FS_HAS_FIEMAP compat macro green
2015-07-30 22:27 ` [PATCH 04/13] staging/lustre: Drop SLAB_DESTROY_BY_RCU redefine, it's always defined green
2015-07-30 22:27 ` [PATCH 05/13] staging/lustre: remove *hw_segments compat defines green
2015-07-30 22:27 ` [PATCH 06/13] staging/lustre: Drop SEEK_* definition checks green
2015-07-31 23:00 ` Greg Kroah-Hartman
2015-07-31 23:37 ` Oleg Drokin
2015-07-30 22:27 ` [PATCH 07/13] staging/lustre: Drop FMODE_UNSIGNED_OFFSET define green
2015-07-30 22:27 ` [PATCH 08/13] staging/lustre: replace ll_umode_t with umode_t green
2015-07-30 22:28 ` [PATCH 09/13] staging/lustre: Use hlist primitives directly green
2015-07-30 22:28 ` [PATCH 10/13] staging/lustre: Get rid of ll_pagevec_ macros green
2015-07-30 22:28 ` [PATCH 11/13] staging/lustre: ATTR_TIMES_SET is always defined, so don't check it green
2015-07-30 22:28 ` [PATCH 12/13] staging/lustre: Get rid of inode_dio_write_done and inode_dio_read green
2015-07-30 22:28 ` [PATCH 13/13] staging/lustre: use ATTR_OPEN directly, remove ATTR_RAW green
2015-07-31 23:03 ` [PATCH 00/13] Removal of lustre compat macros Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438295284-2307773-3-git-send-email-green@linuxhacker.ru \
--to=green@linuxhacker.ru \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome