Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm...

[~andy/linux] / drivers / scsi / scsi_tgt_if.c

diff --git a/drivers/scsi/scsi_tgt_if.c b/drivers/scsi/scsi_tgt_if.c
index a87e21c35ef269ecae82f68e49ee235dd3d0eced..0172de19700874280447d563520feea7d901125d 100644 (file)
--- a/drivers/scsi/scsi_tgt_if.c
+++ b/drivers/scsi/scsi_tgt_if.c
@@ -22,7 +22,6 @@
 #include <linux/miscdevice.h>
 #include <linux/gfp.h>
 #include <linux/file.h>
-#include <linux/smp_lock.h>
 #include <net/tcp.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -323,7 +322,6 @@ static int tgt_open(struct inode *inode, struct file *file)
 {
        tx_ring.tr_idx = rx_ring.tr_idx = 0;
 
-       cycle_kernel_lock();
        return 0;
 }
 
@@ -333,6 +331,7 @@ static const struct file_operations tgt_fops = {
        .poll           = tgt_poll,
        .write          = tgt_write,
        .mmap           = tgt_mmap,
+       .llseek         = noop_llseek,
 };
 
 static struct miscdevice tgt_miscdev = {