diff options
| author | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
| commit | 539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch) | |
| tree | e603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /fs/inode.c | |
| parent | ba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff) | |
| parent | 4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c index 407bf392e20a..258ec22bb298 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -1205,8 +1205,6 @@ void generic_delete_inode(struct inode *inode) | |||
| 1205 | inodes_stat.nr_inodes--; | 1205 | inodes_stat.nr_inodes--; |
| 1206 | spin_unlock(&inode_lock); | 1206 | spin_unlock(&inode_lock); |
| 1207 | 1207 | ||
| 1208 | security_inode_delete(inode); | ||
| 1209 | |||
| 1210 | if (op->delete_inode) { | 1208 | if (op->delete_inode) { |
| 1211 | void (*delete)(struct inode *) = op->delete_inode; | 1209 | void (*delete)(struct inode *) = op->delete_inode; |
| 1212 | /* Filesystems implementing their own | 1210 | /* Filesystems implementing their own |