summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-02 16:17:04 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-02 16:17:04 +0800
commitdb7392c2fb2fb149a5c9243f4189748b445bc1a3 (patch)
tree67cd9ef2e979493e11ff638ab22135fbedc01419
parent077069aec22866a20a466beb2f65afa42957b78e (diff)
downloadblackbird-op-linux-db7392c2fb2fb149a5c9243f4189748b445bc1a3.tar.gz
blackbird-op-linux-db7392c2fb2fb149a5c9243f4189748b445bc1a3.zip
staging: lustre: remove ll_invalidate_bdev()
It was a wrapper around invalidate_bdev(), totally useless. Cc: Peng Tao <tao.peng@emc.com> Cc: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/include/linux/lustre_compat25.h2
-rw-r--r--drivers/staging/lustre/lustre/llite/lloop.c2
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 8691aee0b4d4..6f2707275e5d 100644
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -95,8 +95,6 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
#define TREE_READ_LOCK_IRQ(mapping) spin_lock_irq(&(mapping)->tree_lock)
#define TREE_READ_UNLOCK_IRQ(mapping) spin_unlock_irq(&(mapping)->tree_lock)
-#define ll_invalidate_bdev(a,b) invalidate_bdev((a))
-
#ifndef FS_HAS_FIEMAP
#define FS_HAS_FIEMAP (0)
#endif
diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index 83743c9d5333..2340458b8a04 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -573,7 +573,7 @@ static int loop_clr_fd(struct lloop_device *lo, struct block_device *bdev,
lo->lo_offset = 0;
lo->lo_sizelimit = 0;
lo->lo_flags = 0;
- ll_invalidate_bdev(bdev, 0);
+ invalidate_bdev(bdev);
set_capacity(disks[lo->lo_number], 0);
bd_set_size(bdev, 0);
mapping_set_gfp_mask(filp->f_mapping, gfp);
OpenPOWER on IntegriCloud