diff options
| author | Rob Jones <rob.jones@codethink.co.uk> | 2014-10-13 15:54:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 02:18:23 +0200 |
| commit | d66a0520cb46fb4f86b070e5f1926f6e53f23b38 (patch) | |
| tree | b7281faa4e9b6bffe7215d1bb875830e6ca64e99 /ipc/util.c | |
| parent | bf77b94c99ad5df0d97a52522fc7a220c0bf44fe (diff) | |
| download | linux-stable-d66a0520cb46fb4f86b070e5f1926f6e53f23b38.tar.gz linux-stable-d66a0520cb46fb4f86b070e5f1926f6e53f23b38.tar.bz2 linux-stable-d66a0520cb46fb4f86b070e5f1926f6e53f23b38.zip | |
ipc/util.c: use __seq_open_private() instead of seq_open()
Using __seq_open_private() removes boilerplate code from
sysvipc_proc_open().
The resultant code is shorter and easier to follow.
However, please note that __seq_open_private() call kzalloc() rather than
kmalloc() which may affect timing due to the memory initialisation
overhead.
Signed-off-by: Rob Jones <rob.jones@codethink.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/util.c')
| -rw-r--r-- | ipc/util.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/ipc/util.c b/ipc/util.c index d73b7af581e2..88adc329888c 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -892,28 +892,16 @@ static const struct seq_operations sysvipc_proc_seqops = { static int sysvipc_proc_open(struct inode *inode, struct file *file) { - int ret; - struct seq_file *seq; struct ipc_proc_iter *iter; - ret = -ENOMEM; - iter = kmalloc(sizeof(*iter), GFP_KERNEL); + iter = __seq_open_private(file, &sysvipc_proc_seqops, sizeof(*iter)); if (!iter) - goto out; - - ret = seq_open(file, &sysvipc_proc_seqops); - if (ret) { - kfree(iter); - goto out; - } - - seq = file->private_data; - seq->private = iter; + return -ENOMEM; iter->iface = PDE_DATA(inode); iter->ns = get_ipc_ns(current->nsproxy->ipc_ns); -out: - return ret; + + return 0; } static int sysvipc_proc_release(struct inode *inode, struct file *file) |