diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /fs/open.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 4 |
1 files changed, 3 insertions, 1 deletions
| @@ -1031,7 +1031,9 @@ EXPORT_SYMBOL(generic_file_open); | |||
| 1031 | 1031 | ||
| 1032 | /* | 1032 | /* |
| 1033 | * This is used by subsystems that don't want seekable | 1033 | * This is used by subsystems that don't want seekable |
| 1034 | * file descriptors | 1034 | * file descriptors. The function is not supposed to ever fail, the only |
| 1035 | * reason it returns an 'int' and not 'void' is so that it can be plugged | ||
| 1036 | * directly into file_operations structure. | ||
| 1035 | */ | 1037 | */ |
| 1036 | int nonseekable_open(struct inode *inode, struct file *filp) | 1038 | int nonseekable_open(struct inode *inode, struct file *filp) |
| 1037 | { | 1039 | { |