Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 418690b6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 49126e47

drivers/staging/lustre/lustre/include/linux/lustre_compat25.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -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) \

# define ll_generic_permission(inode, mask, flags, check_acl) \

	 generic_permission(inode, mask)

	 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_dentry_open(a,b,c)	dentry_open(a,b,c)





#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \

#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \

drivers/staging/lustre/lustre/llite/lloop.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -617,7 +617,7 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode, 
	case LL_IOC_LLOOP_DETACH: {

	case LL_IOC_LLOOP_DETACH: {

		err = loop_clr_fd(lo, bdev, 2);

		err = loop_clr_fd(lo, bdev, 2);

		if (err == 0)

		if (err == 0)

			ll_blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */

			blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */

		break;

		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);

		err = loop_set_fd(lo, NULL, bdev, file);

		if (err) {

		if (err) {

			fput(file);

			fput(file);

			ll_blkdev_put(bdev, 0);

			blkdev_put(bdev, 0);

		}

		}





		break;

		break;
@@ -736,7 +736,7 @@ static enum llioc_iter lloop_ioctl(struct inode *unused, struct file *file, 
		bdev = lo->lo_device;

		bdev = lo->lo_device;

		err = loop_clr_fd(lo, bdev, 1);

		err = loop_clr_fd(lo, bdev, 1);

		if (err == 0)

		if (err == 0)

			ll_blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */

			blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */





		break;

		break;

	}

	}