diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-02 15:46:32 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-02 15:46:32 +0800 |
| commit | 418690b60f04a0047f50f8650dc974dabeba195d (patch) | |
| tree | a391a6a6739da958ac92ddf7c0a53868041620c6 /drivers/staging/lustre | |
| parent | staging/lustre: lloop depends on BLOCK (diff) | |
| download | linux-dev-418690b60f04a0047f50f8650dc974dabeba195d.tar.xz linux-dev-418690b60f04a0047f50f8650dc974dabeba195d.zip | |
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>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/include/linux/lustre_compat25.h | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/lloop.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h index 018e604490b7..968cf7381a31 100644 --- 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 ae3dc9d5b484..83743c9d5333 100644 --- 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; } |