diff options
| -rw-r--r-- | Documentation/networking/3c509.txt | 2 | ||||
| -rw-r--r-- | drivers/md/dm-ioctl.c | 1 | ||||
| -rw-r--r-- | fs/open.c | 2 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 | ||||
| -rw-r--r-- | mm/truncate.c | 8 |
5 files changed, 6 insertions, 9 deletions
diff --git a/Documentation/networking/3c509.txt b/Documentation/networking/3c509.txt index 92b60517c8d3..867a99f88c68 100644 --- a/Documentation/networking/3c509.txt +++ b/Documentation/networking/3c509.txt @@ -52,7 +52,7 @@ loaded as a module, only the IRQ and transceiver setting may be overridden. For example, setting two cards to 10base2/IRQ10 and AUI/IRQ11 is done by using the xcvr and irq module options: - options 3c509 xcvr=3,3 irq=10,11 + options 3c509 xcvr=3,1 irq=10,11 (2) Full-duplex mode diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 3bc04ee7cb08..a6fa7d31e43a 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1115,7 +1115,6 @@ int __init dm_interface_init(void) DM_DRIVER_EMAIL); return 0; - failed: if (misc_deregister(&_dm_misc) < 0) DMERR("misc_deregister failed for control device"); dm_hash_exit(); diff --git a/fs/open.c b/fs/open.c index f3d0de4d7867..b8ea4700af59 100644 --- a/fs/open.c +++ b/fs/open.c @@ -902,7 +902,7 @@ asmlinkage long sys_vhangup(void) /* * Called when an inode is about to be open. - * We use this to disallow opening RW large files on 32bit systems if + * We use this to disallow opening large files on 32bit systems if * the caller didn't specify O_LARGEFILE. On 64bit systems we force * on this flag in sys_open. */ diff --git a/include/linux/fs.h b/include/linux/fs.h index e514d070e334..7365aef817b5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -313,7 +313,7 @@ struct backing_dev_info; struct address_space { struct inode *host; /* owner: inode, block_device */ struct radix_tree_root page_tree; /* radix tree of all pages */ - spinlock_t page_lock; /* and rwlock protecting it */ + spinlock_t page_lock; /* and spinlock protecting it */ struct list_head clean_pages; /* list of clean pages */ struct list_head dirty_pages; /* list of dirty pages */ struct list_head locked_pages; /* list of locked pages */ diff --git a/mm/truncate.c b/mm/truncate.c index 8828e0e48bf0..0f6706fcda18 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -173,15 +173,13 @@ void truncate_inode_pages(struct address_space *mapping, loff_t lstart) } pagevec_release(&pvec); } - if (lstart == 0 && mapping->nrpages) - printk("%s: I goofed!\n", __FUNCTION__); } /** * invalidate_mapping_pages - Invalidate all the unlocked pages of one inode - * @inode: the address_space which holds the pages to invalidate - * @end: the index of the last page to invalidate (inclusive) - * @nr_pages: defines the pagecache span. Invalidate up to @start + @nr_pages + * @mapping: the address_space which holds the pages to invalidate + * @start: the offset 'from' which to invalidate + * @end: the offset 'to' which to invalidate (inclusive) * * This function only removes the unlocked pages, if you want to * remove all the pages of one inode, you must call truncate_inode_pages. |