Commit 871fa907 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: Add missing mutex_unlock call to error path
  missing unlock in jfs_quota_write()
parents 7702667b 79f52b77

fs/jfs/jfs_imap.c

+1 −0
Original line number Diff line number Diff line
@@ -2571,6 +2571,7 @@ diNewIAG(struct inomap * imap, int *iagnop, int agno, struct metapage ** mpp) 


			txAbort(tid, 0);

			txEnd(tid);

			mutex_unlock(&JFS_IP(ipimap)->commit_mutex);



			/* release the inode map lock */

			IWRITE_UNLOCK(ipimap);

fs/jfs/super.c

+3 −1
Original line number Diff line number Diff line
@@ -720,8 +720,10 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type, 
		blk++;

	}

out:

	if (len == towrite)

	if (len == towrite) {

		mutex_unlock(&inode->i_mutex);

		return err;

	}

	if (inode->i_size < off+len-towrite)

		i_size_write(inode, off+len-towrite);

	inode->i_version++;