diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/file_table.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/file_table.c')
| -rw-r--r-- | fs/file_table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index 0131ba06e1ee..bc35a40417d7 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
| @@ -169,7 +169,7 @@ void fastcall __fput(struct file *file) | |||
| 169 | if (file->f_op && file->f_op->release) | 169 | if (file->f_op && file->f_op->release) |
| 170 | file->f_op->release(inode, file); | 170 | file->f_op->release(inode, file); |
| 171 | security_file_free(file); | 171 | security_file_free(file); |
| 172 | if (unlikely(inode->i_cdev != NULL)) | 172 | if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL)) |
| 173 | cdev_put(inode->i_cdev); | 173 | cdev_put(inode->i_cdev); |
| 174 | fops_put(file->f_op); | 174 | fops_put(file->f_op); |
| 175 | if (file->f_mode & FMODE_WRITE) | 175 | if (file->f_mode & FMODE_WRITE) |