diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
| commit | c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 (patch) | |
| tree | 1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d /fs/seq_file.c | |
| parent | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (diff) | |
| parent | 8e8b77dd4846b73f2e0756cf59123ee709246d11 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'fs/seq_file.c')
| -rw-r--r-- | fs/seq_file.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/seq_file.c b/fs/seq_file.c index 38ef913767ff..7c40570b71dc 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -28,13 +28,17 @@ */ int seq_open(struct file *file, struct seq_operations *op) { - struct seq_file *p = kmalloc(sizeof(*p), GFP_KERNEL); - if (!p) - return -ENOMEM; + struct seq_file *p = file->private_data; + + if (!p) { + p = kmalloc(sizeof(*p), GFP_KERNEL); + if (!p) + return -ENOMEM; + file->private_data = p; + } memset(p, 0, sizeof(*p)); sema_init(&p->sem, 1); p->op = op; - file->private_data = p; /* * Wrappers around seq_open(e.g. swaps_open) need to be |