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, 3 insertions, 3 deletions

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index e3bd4bc339f4..4a2fed350d4e 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -4724,7 +4724,7 @@ err_out:
 
 
 /* Flush the tape buffer before close */
-static int os_scsi_tape_flush(struct file * filp)
+static int os_scsi_tape_flush(struct file * filp, fl_owner_t id)
 {
         int                   result = 0, result2;
         struct osst_tape    * STp    = filp->private_data;
@@ -5492,7 +5492,7 @@ static int __init osst_setup (char *str)
   char *stp;
 
   stp = get_options(str, ARRAY_SIZE(ints), ints);
-        
+
   if (ints[0] > 0) {
         for (i = 0; i < ints[0] && i < ARRAY_SIZE(parms); i++)
                   *parms[i].val = ints[i + 1];
@@ -5507,7 +5507,7 @@ static int __init osst_setup (char *str)
                                 break;
                         }
                 }
-                if (i >= sizeof(parms) / sizeof(struct osst_dev_parm))
+                if (i >= ARRAY_SIZE(parms))
                         printk(KERN_INFO "osst :I: Illegal parameter in '%s'\n",
                                stp);
                 stp = strchr(stp, ',');