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

Commit a87da408 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: update mailing list address
  nilfs2: Storage class should be before const qualifier
  nilfs2: trivial coding style fix
parents 45d28b09 6aff43f8

Documentation/filesystems/nilfs2.txt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ described in the man pages included in the package. 
Project web page:    http://www.nilfs.org/en/

Download page:       http://www.nilfs.org/en/download.html

Git tree web page:   http://www.nilfs.org/git/

NILFS mailing lists: http://www.nilfs.org/mailman/listinfo/users

List info:           http://vger.kernel.org/vger-lists.html#linux-nilfs



Caveats

=======

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3873,7 +3873,7 @@ F: drivers/net/ni5010.* 


NILFS2 FILESYSTEM

M:	KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>

L:	users@nilfs.org

L:	linux-nilfs@vger.kernel.org

W:	http://www.nilfs.org/en/

S:	Supported

F:	Documentation/filesystems/nilfs2.txt

fs/nilfs2/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -417,8 +417,8 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap, 


	key = page_index(bh->b_page) << (PAGE_CACHE_SHIFT -

					 bmap->b_inode->i_blkbits);

	for (pbh = page_buffers(bh->b_page); pbh != bh;

	     pbh = pbh->b_this_page, key++);

	for (pbh = page_buffers(bh->b_page); pbh != bh; pbh = pbh->b_this_page)

		key++;



	return key;

}

fs/nilfs2/cpfile.c

+18 −13
Original line number Diff line number Diff line
@@ -328,21 +328,26 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile, 
			tnicps += nicps;

			nilfs_mdt_mark_buffer_dirty(cp_bh);

			nilfs_mdt_mark_dirty(cpfile);

			if (!nilfs_cpfile_is_in_first(cpfile, cno) &&

			    (count = nilfs_cpfile_block_sub_valid_checkpoints(

				    cpfile, cp_bh, kaddr, nicps)) == 0) {

			if (!nilfs_cpfile_is_in_first(cpfile, cno)) {

				count =

				  nilfs_cpfile_block_sub_valid_checkpoints(

						cpfile, cp_bh, kaddr, nicps);

				if (count == 0) {

					/* make hole */

					kunmap_atomic(kaddr, KM_USER0);

					brelse(cp_bh);

				ret = nilfs_cpfile_delete_checkpoint_block(

					ret =

					  nilfs_cpfile_delete_checkpoint_block(

								   cpfile, cno);

					if (ret == 0)

						continue;

				printk(KERN_ERR "%s: cannot delete block\n",

					printk(KERN_ERR

					       "%s: cannot delete block\n",

					       __func__);

					break;

				}

			}

		}



		kunmap_atomic(kaddr, KM_USER0);

		brelse(cp_bh);

fs/nilfs2/direct.c

+9 −8
Original line number Diff line number Diff line
@@ -51,11 +51,11 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *bmap, 
	struct nilfs_direct *direct;

	__u64 ptr;



	direct = (struct nilfs_direct *)bmap;

	if ((key > NILFS_DIRECT_KEY_MAX) ||

	    (level != 1) ||	/* XXX: use macro for level 1 */

	    ((ptr = nilfs_direct_get_ptr(direct, key)) ==

	     NILFS_BMAP_INVALID_PTR))

	direct = (struct nilfs_direct *)bmap;  /* XXX: use macro for level 1 */

	if (key > NILFS_DIRECT_KEY_MAX || level != 1)

		return -ENOENT;

	ptr = nilfs_direct_get_ptr(direct, key);

	if (ptr == NILFS_BMAP_INVALID_PTR)

		return -ENOENT;



	if (ptrp != NULL)
@@ -73,9 +73,10 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *bmap, 
	sector_t blocknr;

	int ret, cnt;



	if (key > NILFS_DIRECT_KEY_MAX ||

	    (ptr = nilfs_direct_get_ptr(direct, key)) ==

	    NILFS_BMAP_INVALID_PTR)

	if (key > NILFS_DIRECT_KEY_MAX)

		return -ENOENT;

	ptr = nilfs_direct_get_ptr(direct, key);

	if (ptr == NILFS_BMAP_INVALID_PTR)

		return -ENOENT;



	if (NILFS_BMAP_USE_VBN(bmap)) {