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

Commit 44fa2b4b 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: fix typo "numer" -> "number" in alloc.c
  nilfs2: Remove an uninitialization warning in nilfs_btree_propagate_v()
  nilfs2: fix a wrong type conversion in nilfs_ioctl()
parents 0eddb519 be3bd222

fs/nilfs2/alloc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -426,7 +426,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode, 
	bitmap = bitmap_kaddr + bh_offset(req->pr_bitmap_bh);

	bitmap = bitmap_kaddr + bh_offset(req->pr_bitmap_bh);

	if (!nilfs_clear_bit_atomic(nilfs_mdt_bgl_lock(inode, group),

	if (!nilfs_clear_bit_atomic(nilfs_mdt_bgl_lock(inode, group),

				    group_offset, bitmap))

				    group_offset, bitmap))

		printk(KERN_WARNING "%s: entry numer %llu already freed\n",

		printk(KERN_WARNING "%s: entry number %llu already freed\n",

		       __func__, (unsigned long long)req->pr_entry_nr);

		       __func__, (unsigned long long)req->pr_entry_nr);





	nilfs_palloc_group_desc_add_entries(inode, group, desc, 1);

	nilfs_palloc_group_desc_add_entries(inode, group, desc, 1);

fs/nilfs2/btree.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1879,7 +1879,7 @@ static int nilfs_btree_propagate_v(struct nilfs_btree *btree, 
				   struct nilfs_btree_path *path,

				   struct nilfs_btree_path *path,

				   int level, struct buffer_head *bh)

				   int level, struct buffer_head *bh)

{

{

	int maxlevel, ret;

	int maxlevel = 0, ret;

	struct nilfs_btree_node *parent;

	struct nilfs_btree_node *parent;

	struct inode *dat = nilfs_bmap_get_dat(&btree->bt_bmap);

	struct inode *dat = nilfs_bmap_get_dat(&btree->bt_bmap);

	__u64 ptr;

	__u64 ptr;

fs/nilfs2/ioctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -649,7 +649,7 @@ static int nilfs_ioctl_get_info(struct inode *inode, struct file *filp, 
long nilfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

long nilfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

{

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_dentry->d_inode;

	void __user *argp = (void * __user *)arg;

	void __user *argp = (void __user *)arg;





	switch (cmd) {

	switch (cmd) {

	case NILFS_IOCTL_CHANGE_CPMODE:

	case NILFS_IOCTL_CHANGE_CPMODE: