Remove shmem_nrpages, no use is made of it (even 2.4-ac, though it
counts it, does nothing with it): reintroduce if it becomes useful.
Replace GPL oneliner by the block from 2.4-ac, extend Copyright to
2003, remove two white spaces.
--- tmpfs2/include/linux/shmem_fs.h Tue Dec 10 02:46:16 2002
+++ tmpfs3/include/linux/shmem_fs.h Fri Jun 6 16:10:09 2003
@@ -7,8 +7,6 @@
#define SHMEM_NR_DIRECT 16
-extern atomic_t shmem_nrpages;
-
struct shmem_inode_info {
spinlock_t lock;
unsigned long next_index;
--- tmpfs2/mm/shmem.c Fri Jun 6 19:24:34 2003
+++ tmpfs3/mm/shmem.c Fri Jun 6 19:26:37 2003
@@ -6,8 +6,22 @@
* 2000-2001 Christoph Rohland
* 2000-2001 SAP AG
* 2002 Red Hat Inc.
+ * Copyright (C) 2002-2003 Hugh Dickins.
+ * Copyright (C) 2002-2003 VERITAS Software Corporation.
*
- * This file is released under the GPL.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/*
@@ -128,9 +142,8 @@
.memory_backed = 1, /* Does not contribute to dirty memory */
};
-LIST_HEAD (shmem_inodes);
+LIST_HEAD(shmem_inodes);
static spinlock_t shmem_ilock = SPIN_LOCK_UNLOCKED;
-atomic_t shmem_nrpages = ATOMIC_INIT(0); /* Not used right now */
static void shmem_free_block(struct inode *inode)
{
@@ -965,7 +978,7 @@
size = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT;
if (pgoff >= size || pgoff + (len >> PAGE_SHIFT) > size)
return -EINVAL;
-
+
while ((long) len > 0) {
struct page *page = NULL;
int err;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Jun 15 2003 - 22:00:24 EST