openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: remove whitespaces before quoted newlines
  nilfs2: remove spaces before tabs
  nilfs2: fix various typos in comments
  nilfs2: fix typo "cout" -> "count" in error message
  nilfs2: fix function name typos in docbook comments
  nilfs2: fix discrepancy in use of static specifier
This commit is contained in:
Linus Torvalds 2010-03-14 11:13:24 -07:00
parent bced863599 c91cea11df
commit f901e75392
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nilfs2/alloc.h
View File

@ -42,7 +42,7 @@ void *nilfs_palloc_block_get_entry(const struct inode *, __u64,
const struct buffer_head *, void *); const struct buffer_head *, void *);
/** /**
* nilfs_palloc_req - persistent alloctor request and reply * nilfs_palloc_req - persistent allocator request and reply
* @pr_entry_nr: entry number (vblocknr or inode number) * @pr_entry_nr: entry number (vblocknr or inode number)
* @pr_desc_bh: buffer head of the buffer containing block group descriptors * @pr_desc_bh: buffer head of the buffer containing block group descriptors
* @pr_bitmap_bh: buffer head of the buffer containing a block group bitmap * @pr_bitmap_bh: buffer head of the buffer containing a block group bitmap

2
fs/nilfs2/dat.c
View File

@ -288,7 +288,7 @@ int nilfs_dat_mark_dirty(struct inode *dat, __u64 vblocknr)
* @vblocknrs and @nitems. * @vblocknrs and @nitems.
* *
* Return Value: On success, 0 is returned. On error, one of the following * Return Value: On success, 0 is returned. On error, one of the following
* nagative error codes is returned. * negative error codes is returned.
* *
* %-EIO - I/O error. * %-EIO - I/O error.
* *

2
fs/nilfs2/dir.c
View File

@ -396,7 +396,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
/* next page is past the blocks we've got */ /* next page is past the blocks we've got */
if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) { if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {
nilfs_error(dir->i_sb, __func__, nilfs_error(dir->i_sb, __func__,
"dir %lu size %lld exceeds block cout %llu", "dir %lu size %lld exceeds block count %llu",
dir->i_ino, dir->i_size, dir->i_ino, dir->i_size,
(unsigned long long)dir->i_blocks); (unsigned long long)dir->i_blocks);
goto out; goto out;

4
fs/nilfs2/gcinode.c
View File

@ -28,10 +28,10 @@
* gcinodes), and this file provides lookup function of the dummy * gcinodes), and this file provides lookup function of the dummy
* inodes and their buffer read function. * inodes and their buffer read function.
* *
* Since NILFS2 keeps up multiple checkpoints/snapshots accross GC, it * Since NILFS2 keeps up multiple checkpoints/snapshots across GC, it
* has to treat blocks that belong to a same file but have different * has to treat blocks that belong to a same file but have different
* checkpoint numbers. To avoid interference among generations, dummy * checkpoint numbers. To avoid interference among generations, dummy
* inodes are managed separatly from actual inodes, and their lookup * inodes are managed separately from actual inodes, and their lookup
* function (nilfs_gc_iget) is designed to be specified with a * function (nilfs_gc_iget) is designed to be specified with a
* checkpoint number argument as well as an inode number. * checkpoint number argument as well as an inode number.
* *

4
fs/nilfs2/page.c
View File

@ -292,7 +292,7 @@ void nilfs_free_private_page(struct page *page)
* @src: source page * @src: source page
* @copy_dirty: flag whether to copy dirty states on the page's buffer heads. * @copy_dirty: flag whether to copy dirty states on the page's buffer heads.
* *
* This fuction is for both data pages and btnode pages. The dirty flag * This function is for both data pages and btnode pages. The dirty flag
* should be treated by caller. The page must not be under i/o. * should be treated by caller. The page must not be under i/o.
* Both src and dst page must be locked * Both src and dst page must be locked
*/ */
@ -388,7 +388,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,
} }
/** /**
* nilfs_copy_back_pages -- copy back pages to orignal cache from shadow cache * nilfs_copy_back_pages -- copy back pages to original cache from shadow cache
* @dmap: destination page cache * @dmap: destination page cache
* @smap: source page cache * @smap: source page cache
* *

10
fs/nilfs2/segbuf.c
View File

@ -32,7 +32,7 @@
struct nilfs_write_info { struct nilfs_write_info {
struct the_nilfs *nilfs; struct the_nilfs *nilfs;
struct bio *bio; struct bio *bio;
int start, end; /* The region to be submitted */ int start, end; /* The region to be submitted */
int rest_blocks; int rest_blocks;
int max_pages; int max_pages;
int nr_vecs; int nr_vecs;
@ -174,7 +174,7 @@ int nilfs_segbuf_reset(struct nilfs_segment_buffer *segbuf, unsigned flags,
} }
/* /*
* Setup segument summary * Setup segment summary
*/ */
void nilfs_segbuf_fill_in_segsum(struct nilfs_segment_buffer *segbuf) void nilfs_segbuf_fill_in_segsum(struct nilfs_segment_buffer *segbuf)
{ {
@ -470,8 +470,8 @@ static int nilfs_segbuf_submit_bh(struct nilfs_segment_buffer *segbuf,
* *
* %-ENOMEM - Insufficient memory available. * %-ENOMEM - Insufficient memory available.
*/ */
int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf, static int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf,
struct the_nilfs *nilfs) struct the_nilfs *nilfs)
{ {
struct nilfs_write_info wi; struct nilfs_write_info wi;
struct buffer_head *bh; struct buffer_head *bh;
@ -514,7 +514,7 @@ int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf,
* *
* %-EIO - I/O error * %-EIO - I/O error
*/ */
int nilfs_segbuf_wait(struct nilfs_segment_buffer *segbuf) static int nilfs_segbuf_wait(struct nilfs_segment_buffer *segbuf)
{ {
int err = 0; int err = 0;

8
fs/nilfs2/segment.c
View File

@ -141,7 +141,7 @@ int nilfs_init_transaction_cache(void)
} }
/** /**
* nilfs_detroy_transaction_cache - destroy the cache for transaction info * nilfs_destroy_transaction_cache - destroy the cache for transaction info
* *
* nilfs_destroy_transaction_cache() frees the slab cache for the struct * nilfs_destroy_transaction_cache() frees the slab cache for the struct
* nilfs_transaction_info. * nilfs_transaction_info.
@ -201,7 +201,7 @@ static int nilfs_prepare_segment_lock(struct nilfs_transaction_info *ti)
* This function allocates a nilfs_transaction_info struct to keep context * This function allocates a nilfs_transaction_info struct to keep context
* information on it. It is initialized and hooked onto the current task in * information on it. It is initialized and hooked onto the current task in
* the outermost call. If a pre-allocated struct is given to @ti, it is used * the outermost call. If a pre-allocated struct is given to @ti, it is used
* instead; othewise a new struct is assigned from a slab. * instead; otherwise a new struct is assigned from a slab.
* *
* When @vacancy_check flag is set, this function will check the amount of * When @vacancy_check flag is set, this function will check the amount of
* free space, and will wait for the GC to reclaim disk space if low capacity. * free space, and will wait for the GC to reclaim disk space if low capacity.
@ -2214,7 +2214,7 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)
} }
/** /**
* nilfs_secgtor_start_timer - set timer of background write * nilfs_segctor_start_timer - set timer of background write
* @sci: nilfs_sc_info * @sci: nilfs_sc_info
* *
* If the timer has already been set, it ignores the new request. * If the timer has already been set, it ignores the new request.
@ -2854,7 +2854,7 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci)
* @sbi: nilfs_sb_info * @sbi: nilfs_sb_info
* *
* nilfs_attach_segment_constructor() allocates a struct nilfs_sc_info, * nilfs_attach_segment_constructor() allocates a struct nilfs_sc_info,
* initilizes it, and starts the segment constructor. * initializes it, and starts the segment constructor.
* *
* Return Value: On success, 0 is returned. On error, one of the following * Return Value: On success, 0 is returned. On error, one of the following
* negative error code is returned. * negative error code is returned.

4
fs/nilfs2/segment.h
View File

@ -30,7 +30,7 @@
#include "sb.h" #include "sb.h"
/** /**
* struct nilfs_recovery_info - Recovery infomation * struct nilfs_recovery_info - Recovery information
* @ri_need_recovery: Recovery status * @ri_need_recovery: Recovery status
* @ri_super_root: Block number of the last super root * @ri_super_root: Block number of the last super root
* @ri_ri_cno: Number of the last checkpoint * @ri_ri_cno: Number of the last checkpoint
@ -71,7 +71,7 @@ struct nilfs_recovery_info {
*/ */
struct nilfs_cstage { struct nilfs_cstage {
int scnt; int scnt;
unsigned flags; unsigned flags;
struct nilfs_inode_info *dirty_file_ptr; struct nilfs_inode_info *dirty_file_ptr;
struct nilfs_inode_info *gc_inode_ptr; struct nilfs_inode_info *gc_inode_ptr;
}; };

2
fs/nilfs2/sufile.c
View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* *
* Written by Koji Sato <koji@osrg.net>. * Written by Koji Sato <koji@osrg.net>.
* Rivised by Ryusuke Konishi <ryusuke@osrg.net>. * Revised by Ryusuke Konishi <ryusuke@osrg.net>.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>

4
fs/nilfs2/super.c
View File

@ -436,7 +436,7 @@ static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf)
/* /*
* Compute the overhead * Compute the overhead
* *
* When distributing meta data blocks outside semgent structure, * When distributing meta data blocks outside segment structure,
* We must count them as the overhead. * We must count them as the overhead.
*/ */
overhead = 0; overhead = 0;
@ -866,7 +866,7 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data)
if ((*flags & MS_RDONLY) && if ((*flags & MS_RDONLY) &&
sbi->s_snapshot_cno != old_opts.snapshot_cno) { sbi->s_snapshot_cno != old_opts.snapshot_cno) {
printk(KERN_WARNING "NILFS (device %s): couldn't " printk(KERN_WARNING "NILFS (device %s): couldn't "
"remount to a different snapshot. \n", "remount to a different snapshot.\n",
sb->s_id); sb->s_id);
err = -EINVAL; err = -EINVAL;
goto restore_opts; goto restore_opts;

2
fs/nilfs2/the_nilfs.c
View File

@ -386,7 +386,7 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs,
nilfs->ns_blocks_per_segment = le32_to_cpu(sbp->s_blocks_per_segment); nilfs->ns_blocks_per_segment = le32_to_cpu(sbp->s_blocks_per_segment);
if (nilfs->ns_blocks_per_segment < NILFS_SEG_MIN_BLOCKS) { if (nilfs->ns_blocks_per_segment < NILFS_SEG_MIN_BLOCKS) {
printk(KERN_ERR "NILFS: too short segment. \n"); printk(KERN_ERR "NILFS: too short segment.\n");
return -EINVAL; return -EINVAL;
} }