* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011 Whamcloud, Inc.
+ *
*/
/*
* This file is part of Lustre, http://www.lustre.org/
int old_gfp_mask;
- spinlock_t lo_lock;
+ cfs_spinlock_t lo_lock;
struct bio *lo_bio;
struct bio *lo_biotail;
int lo_state;
- struct semaphore lo_sem;
- struct semaphore lo_ctl_mutex;
- atomic_t lo_pending;
- wait_queue_head_t lo_bh_wait;
+ cfs_semaphore_t lo_sem;
+ cfs_semaphore_t lo_ctl_mutex;
+ cfs_atomic_t lo_pending;
+ cfs_waitq_t lo_bh_wait;
- request_queue_t *lo_queue;
+ struct request_queue *lo_queue;
const struct lu_env *lo_env;
struct cl_io lo_io;
static int max_loop = MAX_LOOP_DEFAULT;
static struct lloop_device *loop_dev;
static struct gendisk **disks;
-static struct semaphore lloop_mutex;
+static cfs_semaphore_t lloop_mutex;
static void *ll_iocontrol_magic = NULL;
static loff_t get_loop_size(struct lloop_device *lo, struct file *file)
ll_stats_ops_tally(ll_i2sbi(inode),
(rw == WRITE) ? LPROC_LL_BRW_WRITE : LPROC_LL_BRW_READ,
- page_count << PAGE_CACHE_SHIFT);
+ page_count);
pvec->ldp_size = page_count << PAGE_CACHE_SHIFT;
pvec->ldp_nr = page_count;
{
unsigned long flags;
- spin_lock_irqsave(&lo->lo_lock, flags);
+ cfs_spin_lock_irqsave(&lo->lo_lock, flags);
if (lo->lo_biotail) {
lo->lo_biotail->bi_next = bio;
lo->lo_biotail = bio;
} else
lo->lo_bio = lo->lo_biotail = bio;
- spin_unlock_irqrestore(&lo->lo_lock, flags);
+ cfs_spin_unlock_irqrestore(&lo->lo_lock, flags);
- atomic_inc(&lo->lo_pending);
- if (waitqueue_active(&lo->lo_bh_wait))
- wake_up(&lo->lo_bh_wait);
+ cfs_atomic_inc(&lo->lo_pending);
+ if (cfs_waitq_active(&lo->lo_bh_wait))
+ cfs_waitq_signal(&lo->lo_bh_wait);
}
/*
unsigned int page_count = 0;
int rw;
- spin_lock_irq(&lo->lo_lock);
+ cfs_spin_lock_irq(&lo->lo_lock);
first = lo->lo_bio;
if (unlikely(first == NULL)) {
- spin_unlock_irq(&lo->lo_lock);
+ cfs_spin_unlock_irq(&lo->lo_lock);
return 0;
}
lo->lo_bio = NULL;
}
*req = first;
- spin_unlock_irq(&lo->lo_lock);
+ cfs_spin_unlock_irq(&lo->lo_lock);
return count;
}
-static int loop_make_request(request_queue_t *q, struct bio *old_bio)
+static int loop_make_request(struct request_queue *q, struct bio *old_bio)
{
struct lloop_device *lo = q->queuedata;
int rw = bio_rw(old_bio);
CDEBUG(D_INFO, "submit bio sector %llu size %u\n",
(unsigned long long)old_bio->bi_sector, old_bio->bi_size);
- spin_lock_irq(&lo->lo_lock);
+ cfs_spin_lock_irq(&lo->lo_lock);
inactive = (lo->lo_state != LLOOP_BOUND);
- spin_unlock_irq(&lo->lo_lock);
+ cfs_spin_unlock_irq(&lo->lo_lock);
if (inactive)
goto err;
loop_add_bio(lo, old_bio);
return 0;
err:
- bio_io_error(old_bio, old_bio->bi_size);
+ cfs_bio_io_error(old_bio, old_bio->bi_size);
return 0;
}
/*
* kick off io on the underlying address space
*/
-static void loop_unplug(request_queue_t *q)
+static void loop_unplug(struct request_queue *q)
{
struct lloop_device *lo = q->queuedata;
while (bio) {
struct bio *tmp = bio->bi_next;
bio->bi_next = NULL;
- bio_endio(bio, bio->bi_size, ret);
+ cfs_bio_endio(bio, bio->bi_size, ret);
bio = tmp;
}
}
static inline int loop_active(struct lloop_device *lo)
{
- return atomic_read(&lo->lo_pending) || (lo->lo_state == LLOOP_RUNDOWN);
+ return cfs_atomic_read(&lo->lo_pending) ||
+ (lo->lo_state == LLOOP_RUNDOWN);
}
/*
/*
* up sem, we are running
*/
- up(&lo->lo_sem);
+ cfs_up(&lo->lo_sem);
for (;;) {
- wait_event(lo->lo_bh_wait, loop_active(lo));
- if (!atomic_read(&lo->lo_pending)) {
+ cfs_wait_event(lo->lo_bh_wait, loop_active(lo));
+ if (!cfs_atomic_read(&lo->lo_pending)) {
int exiting = 0;
- spin_lock_irq(&lo->lo_lock);
+ cfs_spin_lock_irq(&lo->lo_lock);
exiting = (lo->lo_state == LLOOP_RUNDOWN);
- spin_unlock_irq(&lo->lo_lock);
+ cfs_spin_unlock_irq(&lo->lo_lock);
if (exiting)
break;
}
}
LASSERT(bio != NULL);
- LASSERT(count <= atomic_read(&lo->lo_pending));
+ LASSERT(count <= cfs_atomic_read(&lo->lo_pending));
loop_handle_bio(lo, bio);
- atomic_sub(count, &lo->lo_pending);
+ cfs_atomic_sub(count, &lo->lo_pending);
}
cl_env_put(env, &refcheck);
out:
- up(&lo->lo_sem);
+ cfs_up(&lo->lo_sem);
return ret;
}
int error;
loff_t size;
- if (!try_module_get(THIS_MODULE))
+ if (!cfs_try_module_get(THIS_MODULE))
return -ENODEV;
error = -EBUSY;
lo->lo_queue->unplug_fn = loop_unplug;
/* queue parameters */
- blk_queue_hardsect_size(lo->lo_queue, CFS_PAGE_SIZE);
- blk_queue_max_sectors(lo->lo_queue,
- LLOOP_MAX_SEGMENTS << (CFS_PAGE_SHIFT - 9));
- blk_queue_max_phys_segments(lo->lo_queue, LLOOP_MAX_SEGMENTS);
- blk_queue_max_hw_segments(lo->lo_queue, LLOOP_MAX_SEGMENTS);
+ CLASSERT(CFS_PAGE_SIZE < (1 << (sizeof(unsigned short) * 8)));
+ blk_queue_logical_block_size(lo->lo_queue,
+ (unsigned short)CFS_PAGE_SIZE);
+ blk_queue_max_hw_sectors(lo->lo_queue,
+ LLOOP_MAX_SEGMENTS << (CFS_PAGE_SHIFT - 9));
+ blk_queue_max_segments(lo->lo_queue, LLOOP_MAX_SEGMENTS);
set_capacity(disks[lo->lo_number], size);
bd_set_size(bdev, size << 9);
set_blocksize(bdev, lo->lo_blocksize);
- kernel_thread(loop_thread, lo, CLONE_KERNEL);
- down(&lo->lo_sem);
+ cfs_create_thread(loop_thread, lo, CLONE_KERNEL);
+ cfs_down(&lo->lo_sem);
return 0;
out:
/* This is safe: open() is still holding a reference. */
- module_put(THIS_MODULE);
+ cfs_module_put(THIS_MODULE);
return error;
}
if (filp == NULL)
return -EINVAL;
- spin_lock_irq(&lo->lo_lock);
+ cfs_spin_lock_irq(&lo->lo_lock);
lo->lo_state = LLOOP_RUNDOWN;
- spin_unlock_irq(&lo->lo_lock);
- wake_up(&lo->lo_bh_wait);
+ cfs_spin_unlock_irq(&lo->lo_lock);
+ cfs_waitq_signal(&lo->lo_bh_wait);
- down(&lo->lo_sem);
+ cfs_down(&lo->lo_sem);
lo->lo_backing_file = NULL;
lo->ioctl = NULL;
lo->lo_device = NULL;
lo->lo_state = LLOOP_UNBOUND;
fput(filp);
/* This is safe: open() is still holding a reference. */
- module_put(THIS_MODULE);
+ cfs_module_put(THIS_MODULE);
return 0;
}
+#ifdef HAVE_BLKDEV_PUT_2ARGS
+static int lo_open(struct block_device *bdev, fmode_t mode)
+{
+ struct lloop_device *lo = bdev->bd_disk->private_data;
+#else
static int lo_open(struct inode *inode, struct file *file)
{
struct lloop_device *lo = inode->i_bdev->bd_disk->private_data;
+#endif
- down(&lo->lo_ctl_mutex);
+ cfs_down(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
- up(&lo->lo_ctl_mutex);
+ cfs_up(&lo->lo_ctl_mutex);
return 0;
}
+#ifdef HAVE_BLKDEV_PUT_2ARGS
+static int lo_release(struct gendisk *disk, fmode_t mode)
+{
+ struct lloop_device *lo = disk->private_data;
+#else
static int lo_release(struct inode *inode, struct file *file)
{
struct lloop_device *lo = inode->i_bdev->bd_disk->private_data;
+#endif
- down(&lo->lo_ctl_mutex);
+ cfs_down(&lo->lo_ctl_mutex);
--lo->lo_refcnt;
- up(&lo->lo_ctl_mutex);
+ cfs_up(&lo->lo_ctl_mutex);
return 0;
}
/* lloop device node's ioctl function. */
+#ifdef HAVE_BLKDEV_PUT_2ARGS
+static int lo_ioctl(struct block_device *bdev, fmode_t mode,
+ unsigned int cmd, unsigned long arg)
+{
+ struct lloop_device *lo = bdev->bd_disk->private_data;
+ struct inode *inode = lo->lo_backing_file->f_dentry->d_inode;
+#else
static int lo_ioctl(struct inode *inode, struct file *unused,
unsigned int cmd, unsigned long arg)
{
struct lloop_device *lo = inode->i_bdev->bd_disk->private_data;
struct block_device *bdev = inode->i_bdev;
+#endif
int err = 0;
- down(&lloop_mutex);
+ cfs_down(&lloop_mutex);
switch (cmd) {
case LL_IOC_LLOOP_DETACH: {
err = loop_clr_fd(lo, bdev, 2);
if (err == 0)
- blkdev_put(bdev); /* grabbed in LLOOP_ATTACH */
+ ll_blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */
break;
}
case LL_IOC_LLOOP_INFO: {
- __u64 ino = 0;
+ struct lu_fid fid;
if (lo->lo_state == LLOOP_BOUND)
- ino = lo->lo_backing_file->f_dentry->d_inode->i_ino;
+ fid = ll_i2info(inode)->lli_fid;
+ else
+ fid_zero(&fid);
- if (put_user(ino, (__u64 *)arg))
+ if (copy_to_user((struct lu_fid *)arg, &fid, sizeof(fid)))
err = -EFAULT;
break;
}
err = -EINVAL;
break;
}
- up(&lloop_mutex);
+ cfs_up(&lloop_mutex);
return err;
}
CWARN("Enter llop_ioctl\n");
- down(&lloop_mutex);
+ cfs_down(&lloop_mutex);
switch (cmd) {
case LL_IOC_LLOOP_ATTACH: {
struct lloop_device *lo_free = NULL;
err = loop_set_fd(lo, NULL, bdev, file);
if (err) {
fput(file);
- blkdev_put(bdev);
+ ll_blkdev_put(bdev, 0);
}
break;
bdev = lo->lo_device;
err = loop_clr_fd(lo, bdev, 1);
if (err == 0)
- blkdev_put(bdev); /* grabbed in LLOOP_ATTACH */
+ ll_blkdev_put(bdev, 0); /* grabbed in LLOOP_ATTACH */
break;
}
}
out:
- up(&lloop_mutex);
+ cfs_up(&lloop_mutex);
out1:
if (rcp)
*rcp = err;
goto out_mem3;
}
- init_MUTEX(&lloop_mutex);
+ cfs_init_mutex(&lloop_mutex);
for (i = 0; i < max_loop; i++) {
struct lloop_device *lo = &loop_dev[i];
if (!lo->lo_queue)
goto out_mem4;
- init_MUTEX(&lo->lo_ctl_mutex);
- init_MUTEX_LOCKED(&lo->lo_sem);
- init_waitqueue_head(&lo->lo_bh_wait);
+ cfs_init_mutex(&lo->lo_ctl_mutex);
+ cfs_init_mutex_locked(&lo->lo_sem);
+ cfs_waitq_init(&lo->lo_bh_wait);
lo->lo_number = i;
- spin_lock_init(&lo->lo_lock);
+ cfs_spin_lock_init(&lo->lo_lock);
disk->major = lloop_major;
disk->first_minor = i;
disk->fops = &lo_fops;
out_mem4:
while (i--)
- blk_put_queue(loop_dev[i].lo_queue);
+ blk_cleanup_queue(loop_dev[i].lo_queue);
i = max_loop;
out_mem3:
while (i--)
ll_iocontrol_unregister(ll_iocontrol_magic);
for (i = 0; i < max_loop; i++) {
del_gendisk(disks[i]);
- blk_put_queue(loop_dev[i].lo_queue);
+ blk_cleanup_queue(loop_dev[i].lo_queue);
put_disk(disks[i]);
}
if (ll_unregister_blkdev(lloop_major, "lloop"))
git://git.whamcloud.com / fs / lustre-release.git / blobdiff