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

Commit cd794539 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 

Pull vfs fixes from Al Viro:
 "A bunch of assorted fixes; Jan's freezing stuff still _not_ in there
  and neither is mm fun ;-/"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  restore smp_mb() in unlock_new_inode()
  vfs: fix return value from do_last()
  vfs: fix double put after complete_walk()
  udf: Fix deadlock in udf_release_file()
  vfs: Correctly set the dir i_mutex lockdep class
parents 2f1c2b81 310fa7a3

fs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -938,8 +938,7 @@ void lockdep_annotate_inode_mutex_key(struct inode *inode) 
		struct file_system_type *type = inode->i_sb->s_type;



		/* Set new key only if filesystem hasn't already changed it */

		if (!lockdep_match_class(&inode->i_mutex,

		    &type->i_mutex_key)) {

		if (lockdep_match_class(&inode->i_mutex, &type->i_mutex_key)) {

			/*

			 * ensure nobody is actually holding i_mutex

			 */
@@ -966,6 +965,7 @@ void unlock_new_inode(struct inode *inode) 
	spin_lock(&inode->i_lock);

	WARN_ON(!(inode->i_state & I_NEW));

	inode->i_state &= ~I_NEW;

	smp_mb();

	wake_up_bit(&inode->i_state, __I_NEW);

	spin_unlock(&inode->i_lock);

}

fs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -2162,7 +2162,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, 
		/* sayonara */

		error = complete_walk(nd);

		if (error)

			return ERR_PTR(-ECHILD);

			return ERR_PTR(error);



		error = -ENOTDIR;

		if (nd->flags & LOOKUP_DIRECTORY) {
@@ -2261,7 +2261,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, 
	/* Why this, you ask?  _Now_ we might have grown LOOKUP_JUMPED... */

	error = complete_walk(nd);

	if (error)

		goto exit;

		return ERR_PTR(error);

	error = -EISDIR;

	if (S_ISDIR(nd->inode->i_mode))

		goto exit;

fs/udf/file.c

+0 −2
Original line number Diff line number Diff line
@@ -201,12 +201,10 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
static int udf_release_file(struct inode *inode, struct file *filp)

{

	if (filp->f_mode & FMODE_WRITE) {

		mutex_lock(&inode->i_mutex);

		down_write(&UDF_I(inode)->i_data_sem);

		udf_discard_prealloc(inode);

		udf_truncate_tail_extent(inode);

		up_write(&UDF_I(inode)->i_data_sem);

		mutex_unlock(&inode->i_mutex);

	}

	return 0;

}