Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f901e753 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bced8635 c91cea11

fs/nilfs2/alloc.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void *nilfs_palloc_block_get_entry(const struct inode *, __u64, 
				   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_desc_bh: buffer head of the buffer containing block group descriptors

 * @pr_bitmap_bh: buffer head of the buffer containing a block group bitmap

fs/nilfs2/dat.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ int nilfs_dat_mark_dirty(struct inode *dat, __u64 vblocknr) 
 * @vblocknrs and @nitems.

 *

 * 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.

 *

fs/nilfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, 
		/* next page is past the blocks we've got */

		if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {

			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,

			       (unsigned long long)dir->i_blocks);

			goto out;

fs/nilfs2/gcinode.c

+2 −2
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
 * gcinodes), and this file provides lookup function of the dummy

 * 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

 * 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

 * checkpoint number argument as well as an inode number.

 *

fs/nilfs2/page.c

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ void nilfs_free_private_page(struct page *page) 
 * @src: source page

 * @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.

 * 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

 * @smap: source page cache

 *