diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
| commit | 2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch) | |
| tree | c1f0d002e69868606eca9d1b919835f422892063 /fs/file_table.c | |
| parent | 6836b9bdd98e3b500cd49512484df68f46e14659 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'fs/file_table.c')
| -rw-r--r-- | fs/file_table.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index 69652c5bd5f0..b98404b54383 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
| @@ -253,6 +253,7 @@ void __fput(struct file *file) | |||
| 253 | if (file->f_op && file->f_op->release) | 253 | if (file->f_op && file->f_op->release) |
| 254 | file->f_op->release(inode, file); | 254 | file->f_op->release(inode, file); |
| 255 | security_file_free(file); | 255 | security_file_free(file); |
| 256 | ima_file_free(file); | ||
| 256 | if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL)) | 257 | if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL)) |
| 257 | cdev_put(inode->i_cdev); | 258 | cdev_put(inode->i_cdev); |
| 258 | fops_put(file->f_op); | 259 | fops_put(file->f_op); |