Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index 07be62bbaaea..55200e4fdf11 100644
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -266,8 +266,6 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf,
                 lun = simple_strtoul(p + 1, &p, 0);
 
                 err = scsi_add_single_device(host, channel, id, lun);
-                if (err >= 0)
-                        err = length;
 
         /*
          * Usage: echo "scsi remove-single-device 0 1 2 3" >/proc/scsi/scsi
@@ -284,6 +282,13 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf,
                 err = scsi_remove_single_device(host, channel, id, lun);
         }
 
+        /*
+         * convert success returns so that we return the 
+         * number of bytes consumed.
+         */
+        if (!err)
+                err = length;
+
  out:
         free_page((unsigned long)buffer);
         return err;