Commit d24fec39 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'jfs-3.12' of git://github.com/kleikamp/linux-shaggy 

Pull jfs bugfix from David Kleikamp:
 "Just a patch to fix an oops in an error path"

* tag 'jfs-3.12' of git://github.com/kleikamp/linux-shaggy:
  jfs: fix error path in ialloc
parents b403b73c 86609986

fs/jfs/jfs_inode.c

+1 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode) 


	if (insert_inode_locked(inode) < 0) {

		rc = -EINVAL;

		goto fail_unlock;

		goto fail_put;

	}



	inode_init_owner(inode, parent, mode);
@@ -156,7 +156,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode) 
fail_drop:

	dquot_drop(inode);

	inode->i_flags |= S_NOQUOTA;

fail_unlock:

	clear_nlink(inode);

	unlock_new_inode(inode);

fail_put: