ipc/mqueue.c: refactor failure handling (04715206) · Commits · 戴 / test

If new_inode fails to allocate an inode we need only to return with NULL. But now we test the opposite and have all the work in a nested block. So do the opposite to save one indentation level (and remove unnecessary line breaks). This is only a preparation/cleanup for the next patch where we fix up return values from mqueue_get_inode. Signed-off-by:

Jiri Slaby <jslaby@suse.cz> Cc: Manfred Spraul <manfred@colorfullife.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

ipc/mqueue.c

+57 −56

Original line number	Diff line number	Diff line
		@@ -115,13 +115,14 @@ static struct inode mqueue_get_inode(struct super_block sb,
		struct inode *inode;

		inode = new_inode(sb);
		if (inode) {
		if (!inode)
		goto err;

		inode->i_ino = get_next_ino();
		inode->i_mode = mode;
		inode->i_uid = current_fsuid();
		inode->i_gid = current_fsgid();
		inode->i_mtime = inode->i_ctime = inode->i_atime =
		CURRENT_TIME;
		inode->i_mtime = inode->i_ctime = inode->i_atime = CURRENT_TIME;

		if (S_ISREG(mode)) {
		struct mqueue_inode_info *info;
		@@ -156,8 +157,7 @@ static struct inode mqueue_get_inode(struct super_block sb,

		spin_lock(&mq_lock);
		if (u->mq_bytes + mq_bytes < u->mq_bytes \|\|
		u->mq_bytes + mq_bytes >
		task_rlimit(p, RLIMIT_MSGQUEUE)) {
		u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
		spin_unlock(&mq_lock);
		/* mqueue_evict_inode() releases info->messages */
		goto out_inode;
		@@ -174,10 +174,11 @@ static struct inode mqueue_get_inode(struct super_block sb,
		inode->i_op = &mqueue_dir_inode_operations;
		inode->i_fop = &simple_dir_operations;
		}
		}

		return inode;
		out_inode:
		iput(inode);
		err:
		return NULL;
		}

Admin message