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

Commit 7f0d384c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  Minix: Clean up left over label
  fix truncate inode time modification breakage
  fix setattr error handling in sysfs, configfs
  fcntl: return -EFAULT if copy_to_user fails
  wrong type for 'magic' argument in simple_fill_super()
  fix the deadlock in qib_fs
  mqueue doesn't need make_bad_inode()
parents 90ec7819 01afaf61

drivers/infiniband/hw/qib/qib_fs.c

+1 −3
Original line number Diff line number Diff line
@@ -542,10 +542,8 @@ static int qibfs_fill_super(struct super_block *sb, void *data, int silent) 
	list_for_each_entry_safe(dd, tmp, &qib_dev_list, list) {

		spin_unlock_irqrestore(&qib_devs_lock, flags);

		ret = add_cntr_files(sb, dd);

		if (ret) {

			deactivate_super(sb);

		if (ret)

			goto bail;

		}

		spin_lock_irqsave(&qib_devs_lock, flags);

	}

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr) 
		if (error)

			return error;

	}

	if (iattr->ia_valid & ATTR_SIZE) {

	if (iattr->ia_valid & ATTR_SIZE && iattr->ia_size != inode->i_size) {

		error = ext2_setsize(inode, iattr->ia_size);

		if (error)

			return error;

fs/fcntl.c

+5 −2
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg) 


	ret = copy_from_user(&owner, owner_p, sizeof(owner));

	if (ret)

		return ret;

		return -EFAULT;



	switch (owner.type) {

	case F_OWNER_TID:
@@ -332,8 +332,11 @@ static int f_getown_ex(struct file *filp, unsigned long arg) 
	}

	read_unlock(&filp->f_owner.lock);



	if (!ret)

	if (!ret) {

		ret = copy_to_user(owner_p, &owner, sizeof(owner));

		if (ret)

			ret = -EFAULT;

	}

	return ret;

}

fs/libfs.c

+2 −1
Original line number Diff line number Diff line
@@ -489,7 +489,8 @@ int simple_write_end(struct file *file, struct address_space *mapping, 
 * unique inode values later for this filesystem, then you must take care

 * to pass it an appropriate max_reserved value to avoid collisions.

 */

int simple_fill_super(struct super_block *s, int magic, struct tree_descr *files)

int simple_fill_super(struct super_block *s, unsigned long magic,

		      struct tree_descr *files)

{

	struct inode *inode;

	struct dentry *root;

fs/minix/dir.c

+0 −4
Original line number Diff line number Diff line
@@ -75,10 +75,6 @@ static struct page * dir_get_page(struct inode *dir, unsigned long n) 
	if (!IS_ERR(page))

		kmap(page);

	return page;



fail:

	dir_put_page(page);

	return ERR_PTR(-EIO);

}



static inline void *minix_next_entry(void *de, struct minix_sb_info *sbi)