lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipc/mqueue.c: refactor failure handling

Browse Source 
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>
This commit is contained in:
Jiri Slaby
2011-07-26 16:08:46 -07:00
committed by Linus Torvalds
parent a64a26e822
commit 04715206c0
1 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ipc/mqueue.c
View File

@@ -115,13 +115,14 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
struct inode *inode; struct inode *inode;
inode = new_inode(sb); inode = new_inode(sb);
if (inode) { if (!inode)
goto err;
inode->i_ino = get_next_ino(); inode->i_ino = get_next_ino();
inode->i_mode = mode; inode->i_mode = mode;
inode->i_uid = current_fsuid(); inode->i_uid = current_fsuid();
inode->i_gid = current_fsgid(); inode->i_gid = current_fsgid();
inode->i_mtime = inode->i_ctime = inode->i_atime = inode->i_mtime = inode->i_ctime = inode->i_atime = CURRENT_TIME;
CURRENT_TIME;
if (S_ISREG(mode)) { if (S_ISREG(mode)) {
struct mqueue_inode_info *info; struct mqueue_inode_info *info;
@@ -156,8 +157,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
spin_lock(&mq_lock); spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes || if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes > u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
task_rlimit(p, RLIMIT_MSGQUEUE)) {
spin_unlock(&mq_lock); spin_unlock(&mq_lock);
/* mqueue_evict_inode() releases info->messages */ /* mqueue_evict_inode() releases info->messages */
goto out_inode; 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_op = &mqueue_dir_inode_operations;
inode->i_fop = &simple_dir_operations; inode->i_fop = &simple_dir_operations;
} }
}
return inode; return inode;
out_inode: out_inode:
iput(inode); iput(inode);
err:
return NULL; return NULL;
} }