aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-30 20:14:42 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-30 20:14:42 -0700
commit3ec65cb350728718cfc2541e8f43ea317acd2756 (patch)
tree89f5cf63ed15a16da2a221031acce663bf348b7d /drivers
parentstaging: cxt1e1: linux.c: Return negative error codes (diff)
downloadlinux-dev-3ec65cb350728718cfc2541e8f43ea317acd2756.tar.xz
linux-dev-3ec65cb350728718cfc2541e8f43ea317acd2756.zip
staging: lustre: remove ll_mrf_ret
It's just 'void' and only used in one place, so just remove it, it's useless. Cc: Peng Tao <tao.peng@emc.com> Cc: Zhao Hongjiang <zhaohongjiang@huawei.com> Cc: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/lustre/lustre/include/linux/lustre_compat25.h1
-rw-r--r--drivers/staging/lustre/lustre/llite/lloop.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index 9243dfab43d3..1644d40b2682 100644
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -232,7 +232,6 @@ static inline int ll_namei_to_lookup_intent_flag(int flag)
return flag;
}
-# define ll_mrf_ret void
# define LL_MRF_RETURN(rc)
#include <linux/fs.h>
diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index 2340458b8a04..66ed25e0efa8 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -337,8 +337,7 @@ static unsigned int loop_get_bio(struct lloop_device *lo, struct bio **req)
return count;
}
-static ll_mrf_ret
-loop_make_request(struct request_queue *q, struct bio *old_bio)
+static void loop_make_request(struct request_queue *q, struct bio *old_bio)
{
struct lloop_device *lo = q->queuedata;
int rw = bio_rw(old_bio);