patch-2.4.19 linux-2.4.19/fs/nfsd/nfs3proc.c

Next file: linux-2.4.19/fs/nfsd/nfsctl.c
Previous file: linux-2.4.19/fs/nfsd/export.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.18/fs/nfsd/nfs3proc.c linux-2.4.19/fs/nfsd/nfs3proc.c
@@ -339,7 +339,7 @@
 		    || (argp->ftype == NF3BLK && argp->major >= MAX_BLKDEV)
 		    || argp->minor > 0xFF)
 			RETURN_STATUS(nfserr_inval);
-		rdev = ((argp->major) << 8) | (argp->minor);
+		rdev = MKDEV(argp->major, argp->minor);
 	} else
 		if (argp->ftype != NF3SOCK && argp->ftype != NF3FIFO)
 			RETURN_STATUS(nfserr_inval);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)