diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-10 18:07:47 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-10 18:07:47 -0400 |
| commit | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (patch) | |
| tree | 0cea46e43f0625244c3d06a71d6559e5ec5419ca /fs/file_table.c | |
| parent | 4156e735d3abde8e9243b5d22f7999dd3fffab2e (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/file_table.c')
| -rw-r--r-- | fs/file_table.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index b74a8e1da913..54018fe48840 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
| @@ -169,7 +169,6 @@ struct file *alloc_file(struct vfsmount *mnt, struct dentry *dentry, | |||
| 169 | fmode_t mode, const struct file_operations *fop) | 169 | fmode_t mode, const struct file_operations *fop) |
| 170 | { | 170 | { |
| 171 | struct file *file; | 171 | struct file *file; |
| 172 | struct path; | ||
| 173 | 172 | ||
| 174 | file = get_empty_filp(); | 173 | file = get_empty_filp(); |
| 175 | if (!file) | 174 | if (!file) |