Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313922
b: refs/heads/master
c: 8b51b06
h: refs/heads/master
v: v3
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Jun 10, 2012
1 parent c557904 commit 614b379
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2b823f72585552ef6fb77d6c081e55e047e879f0
refs/heads/master: 8b51b064a6da90c68af5385a874968829a2a0ed7
6 changes: 1 addition & 5 deletions trunk/net/unix/af_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -2255,10 +2255,6 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock,
#define get_offset(x) ((x) & ((1L << BUCKET_SPACE) - 1))
#define set_bucket_offset(b, o) ((b) << BUCKET_SPACE | (o))

struct unix_iter_state {
struct seq_net_private p;
};

static struct sock *unix_from_bucket(struct seq_file *seq, loff_t *pos)
{
unsigned long offset = get_offset(*pos);
Expand Down Expand Up @@ -2383,7 +2379,7 @@ static const struct seq_operations unix_seq_ops = {
static int unix_seq_open(struct inode *inode, struct file *file)
{
return seq_open_net(inode, file, &unix_seq_ops,
sizeof(struct unix_iter_state));
sizeof(struct seq_net_private));
}

static const struct file_operations unix_seq_fops = {
Expand Down

0 comments on commit 614b379

Please sign in to comment.