staging: lustre: remove ll_blkdev_put()

It was a wrapper around blkdev_put(), 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>

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index 018e604490b787da9b5353ebe666e373f2c26ecb..968cf7381a31c27e224d9d4e1f9354c5b4ea857d 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -92,8 +92,6 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
 # define ll_generic_permission(inode, mask, flags, check_acl) \
         generic_permission(inode, mask)
 
-#define ll_blkdev_put(a, b) blkdev_put(a, b)
-
 #define ll_dentry_open(a,b,c)  dentry_open(a,b,c)
 
 #define ll_vfs_symlink(dir, dentry, mnt, path, mode) \

diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index ae3dc9d5b484c3cd75e38d996e53b0348307a18e..83743c9d5333eb16f6a6624fab8237b67dc508c8 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -617,7 +617,7 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode,
        case LL_IOC_LLOOP_DETACH: {
                err = loop_clr_fd(lo, bdev, 2);
                if (err == 0)
-                       ll_blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */
+                       blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */
                break;
        }
 
@@ -712,7 +712,7 @@ static enum llioc_iter lloop_ioctl(struct inode *unused, struct file *file,
                err = loop_set_fd(lo, NULL, bdev, file);
                if (err) {
                        fput(file);
-                       ll_blkdev_put(bdev, 0);
+                       blkdev_put(bdev, 0);
                }
 
                break;
@@ -736,7 +736,7 @@ static enum llioc_iter lloop_ioctl(struct inode *unused, struct file *file,
                bdev = lo->lo_device;
                err = loop_clr_fd(lo, bdev, 1);
                if (err == 0)
-                       ll_blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */
+                       blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */
 
                break;
        }