[Ocfs2-commits] jlbec commits r2393 - in trunk/fs: configfs ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: jlbec
Signed-off-by: manish
Date: 2005-06-14 16:48:01 -0500 (Tue, 14 Jun 2005)
New Revision: 2393

Modified:
   trunk/fs/configfs/file.c
   trunk/fs/ocfs2/dlm/dlmdomain.c
Log:

o Fix off-by-one in configfs.  Noticed by Jon Smirl <jonsmirl at gmail.com>
  in sysfs.

Signed-off-by: manish



Modified: trunk/fs/configfs/file.c
===================================================================
--- trunk/fs/configfs/file.c	2005-06-14 18:29:02 UTC (rev 2392)
+++ trunk/fs/configfs/file.c	2005-06-14 21:48:01 UTC (rev 2393)
@@ -168,7 +168,7 @@
 		return -ENOMEM;
 
 	if (count >= PAGE_SIZE)
-		count = PAGE_SIZE - 1;
+		count = PAGE_SIZE;
 	error = copy_from_user(buffer->page,buf,count);
 	buffer->needs_read_fill = 1;
 	return error ? -EFAULT : count;

Modified: trunk/fs/ocfs2/dlm/dlmdomain.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmdomain.c	2005-06-14 18:29:02 UTC (rev 2392)
+++ trunk/fs/ocfs2/dlm/dlmdomain.c	2005-06-14 21:48:01 UTC (rev 2393)
@@ -678,7 +678,7 @@
 	if (map_size != (BITS_TO_LONGS(O2NM_MAX_NODES) *
 			 sizeof(unsigned long))) {
 		mlog(ML_ERROR,
-		     "map_size %u != BITS_TO_LONGS(O2NM_MAX_NOES) %u\n",
+		     "map_size %u != BITS_TO_LONGS(O2NM_MAX_NODES) %u\n",
 		     map_size, BITS_TO_LONGS(O2NM_MAX_NODES));
 		return -EINVAL;
 	}