Merge master.kernel.org:/home/davem/BK/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

drivers/block/cpqarray.c

@@ -1427,7 +1427,7 @@ static int revalidate_allvol(kdev_t dev)
 	 */
 	for (i = 0; i < NWD; i++) {
 		struct gendisk *disk = ida_gendisk[ctlr][i];
-		if (disk->flags & GENDH_FL_UP)
+		if (disk->flags & GENHD_FL_UP)
 			del_gendisk(disk);
 	}
 	memset(hba[ctlr]->drv,            0, sizeof(drv_info_t)*NWD);

fs/locks.c

@@ -727,12 +727,16 @@ static int flock_lock_file(struct file *filp, struct file_lock *new_fl)
 	}
 	unlock_kernel();
 
-	if (found)
-		yield();
-
 	if (new_fl->fl_type == F_UNLCK)
 		return 0;
 
+	/*
+	 * If a higher-priority process was blocked on the old file lock,
+	 * give it the opportunity to lock the file.
+	 */
+	if (found)
+		cond_resched();
+
 	lock_kernel();
 	for_each_lock(inode, before) {
 		struct file_lock *fl = *before;

fs/nfs/inode.c

@@ -1355,7 +1355,7 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data,
 	if (data->auth_flavourlen != 0) {
 		if (data->auth_flavourlen > 1)
 			printk(KERN_INFO "NFS: cannot yet deal with multiple auth flavours.\n");
-		if (copy_from_user(authflavour, data->auth_flavours, sizeof(authflavour))) {
+		if (copy_from_user(&authflavour, data->auth_flavours, sizeof(authflavour))) {
 			err = -EFAULT;
 			goto out_fail;
 		}

fs/nfs/nfs4xdr.c

@@ -1077,13 +1077,13 @@ decode_getattr(struct nfs4_compound *cp, int nfserr, struct nfs4_getattr *getatt
                 READ_BUF(8);
                 len += 8;
                 READ64(nfp->change_attr);
-                dprintk("read_attrs: changeid=%Ld\n", (u64)nfp->change_attr);
+                dprintk("read_attrs: changeid=%Ld\n", (long long)nfp->change_attr);
         }
         if (bmval0 & FATTR4_WORD0_SIZE) {
                 READ_BUF(8);
                 len += 8;
                 READ64(nfp->size);
-                dprintk("read_attrs: size=%Ld\n", (u64)nfp->size);
+                dprintk("read_attrs: size=%Ld\n", (long long)nfp->size);
         }
         if (bmval0 & FATTR4_WORD0_FSID) {
                 READ_BUF(16);
@@ -1091,7 +1091,8 @@ decode_getattr(struct nfs4_compound *cp, int nfserr, struct nfs4_getattr *getatt
                 READ64(nfp->fsid_u.nfs4.major);
                 READ64(nfp->fsid_u.nfs4.minor);
                 dprintk("read_attrs: fsid=0x%Lx/0x%Lx\n",
-			nfp->fsid_u.nfs4.major, nfp->fsid_u.nfs4.minor);
+			(long long)nfp->fsid_u.nfs4.major,
+			(long long)nfp->fsid_u.nfs4.minor);
         }
         if (bmval0 & FATTR4_WORD0_LEASE_TIME) {
                 READ_BUF(4);
@@ -1103,31 +1104,31 @@ decode_getattr(struct nfs4_compound *cp, int nfserr, struct nfs4_getattr *getatt
                 READ_BUF(8);
                 len += 8;
                 READ64(nfp->fileid);
-                dprintk("read_attrs: fileid=%Ld\n", nfp->fileid);
+                dprintk("read_attrs: fileid=%Ld\n", (long long) nfp->fileid);
         }
 	if (bmval0 & FATTR4_WORD0_FILES_AVAIL) {
 		READ_BUF(8);
 		len += 8;
 		READ64(fsstat->afiles);
-		dprintk("read_attrs: files_avail=0x%Lx\n", fsstat->afiles);
+		dprintk("read_attrs: files_avail=0x%Lx\n", (long long) fsstat->afiles);
 	}
         if (bmval0 & FATTR4_WORD0_FILES_FREE) {
                 READ_BUF(8);
                 len += 8;
                 READ64(fsstat->ffiles);
-                dprintk("read_attrs: files_free=0x%Lx\n", fsstat->ffiles);
+                dprintk("read_attrs: files_free=0x%Lx\n", (long long) fsstat->ffiles);
         }
         if (bmval0 & FATTR4_WORD0_FILES_TOTAL) {
                 READ_BUF(8);
                 len += 8;
                 READ64(fsstat->tfiles);
-                dprintk("read_attrs: files_tot=0x%Lx\n", fsstat->tfiles);
+                dprintk("read_attrs: files_tot=0x%Lx\n", (long long) fsstat->tfiles);
         }
         if (bmval0 & FATTR4_WORD0_MAXFILESIZE) {
                 READ_BUF(8);
                 len += 8;
                 READ64(fsinfo->maxfilesize);
-                dprintk("read_attrs: maxfilesize=0x%Lx\n", fsinfo->maxfilesize);
+                dprintk("read_attrs: maxfilesize=0x%Lx\n", (long long) fsinfo->maxfilesize);
         }
 	if (bmval0 & FATTR4_WORD0_MAXLINK) {
 		READ_BUF(4);
@@ -1214,25 +1215,25 @@ decode_getattr(struct nfs4_compound *cp, int nfserr, struct nfs4_getattr *getatt
                 READ_BUF(8);
                 len += 8;
                 READ64(fsstat->abytes);
-                dprintk("read_attrs: savail=0x%Lx\n", fsstat->abytes);
+                dprintk("read_attrs: savail=0x%Lx\n", (long long) fsstat->abytes);
         }
 	if (bmval1 & FATTR4_WORD1_SPACE_FREE) {
                 READ_BUF(8);
                 len += 8;
                 READ64(fsstat->fbytes);
-                dprintk("read_attrs: sfree=0x%Lx\n", fsstat->fbytes);
+                dprintk("read_attrs: sfree=0x%Lx\n", (long long) fsstat->fbytes);
         }
         if (bmval1 & FATTR4_WORD1_SPACE_TOTAL) {
                 READ_BUF(8);
                 len += 8;
                 READ64(fsstat->tbytes);
-                dprintk("read_attrs: stotal=0x%Lx\n", fsstat->tbytes);
+                dprintk("read_attrs: stotal=0x%Lx\n", (long long) fsstat->tbytes);
         }
         if (bmval1 & FATTR4_WORD1_SPACE_USED) {
                 READ_BUF(8);
                 len += 8;
                 READ64(nfp->du.nfs3.used);
-                dprintk("read_attrs: sused=0x%Lx\n", nfp->du.nfs3.used);
+                dprintk("read_attrs: sused=0x%Lx\n", (long long) nfp->du.nfs3.used);
         }
         if (bmval1 & FATTR4_WORD1_TIME_ACCESS) {
                 READ_BUF(12);

fs/nfs/proc.c

@@ -490,7 +490,7 @@ nfs_proc_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle,
 
 	dprintk("NFS call  fsinfo\n");
 	info->fattr->valid = 0;
-	status = rpc_call(server->client, NFSPROC_STATFS, fhandle, &info, 0);
+	status = rpc_call(server->client, NFSPROC_STATFS, fhandle, &fsinfo, 0);
 	dprintk("NFS reply fsinfo: %d\n", status);
 	if (status)
 		goto out;