aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-06-08 18:10:20 -0400
committerDavid S. Miller <davem@davemloft.net>2012-06-09 22:06:21 -0400
commit8b51b064a6da90c68af5385a874968829a2a0ed7 (patch)
treef84d4bcfa4e408d5d219b4dc58600d084b009409 /net/unix/af_unix.c
parent2b823f72585552ef6fb77d6c081e55e047e879f0 (diff)
af_unix: remove unix_iter_state
As pointed out by Michael Tokarev , struct unix_iter_state is no longer needed. Suggested-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Steven Whitehouse <swhiteho@redhat.com> Cc: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r--net/unix/af_unix.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index cf83f6b5ac91..79981d97bc9c 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2255,10 +2255,6 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock,
2255#define get_offset(x) ((x) & ((1L << BUCKET_SPACE) - 1)) 2255#define get_offset(x) ((x) & ((1L << BUCKET_SPACE) - 1))
2256#define set_bucket_offset(b, o) ((b) << BUCKET_SPACE | (o)) 2256#define set_bucket_offset(b, o) ((b) << BUCKET_SPACE | (o))
2257 2257
2258struct unix_iter_state {
2259 struct seq_net_private p;
2260};
2261
2262static struct sock *unix_from_bucket(struct seq_file *seq, loff_t *pos) 2258static struct sock *unix_from_bucket(struct seq_file *seq, loff_t *pos)
2263{ 2259{
2264 unsigned long offset = get_offset(*pos); 2260 unsigned long offset = get_offset(*pos);
@@ -2383,7 +2379,7 @@ static const struct seq_operations unix_seq_ops = {
2383static int unix_seq_open(struct inode *inode, struct file *file) 2379static int unix_seq_open(struct inode *inode, struct file *file)
2384{ 2380{
2385 return seq_open_net(inode, file, &unix_seq_ops, 2381 return seq_open_net(inode, file, &unix_seq_ops,
2386 sizeof(struct unix_iter_state)); 2382 sizeof(struct seq_net_private));
2387} 2383}
2388 2384
2389static const struct file_operations unix_seq_fops = { 2385static const struct file_operations unix_seq_fops = {