diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 15:34:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 15:34:22 -0500 |
| commit | 9297524f6a2885bfb4e2431d658cd1ffaefbda41 (patch) | |
| tree | 3f0ce942027d5b07f657638d39ea8c0e8dfc12a1 | |
| parent | 8c7b905a2d131a8dd0b081b16c64b17db4ce9392 (diff) | |
| parent | 52b19ac993f1aeadbce15b55302be9a35346e235 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: Fix BUG_ON() in destroy_inode()
| -rw-r--r-- | fs/buffer.c | 1 | ||||
| -rw-r--r-- | fs/udf/inode.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 6569fda5cfed..10179cfa1152 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -878,6 +878,7 @@ void invalidate_inode_buffers(struct inode *inode) | |||
| 878 | spin_unlock(&buffer_mapping->private_lock); | 878 | spin_unlock(&buffer_mapping->private_lock); |
| 879 | } | 879 | } |
| 880 | } | 880 | } |
| 881 | EXPORT_SYMBOL(invalidate_inode_buffers); | ||
| 881 | 882 | ||
| 882 | /* | 883 | /* |
| 883 | * Remove any clean buffers from the inode's buffer list. This is called | 884 | * Remove any clean buffers from the inode's buffer list. This is called |
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 6e74b117aaf0..30ebde490f7f 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
| @@ -106,6 +106,7 @@ void udf_clear_inode(struct inode *inode) | |||
| 106 | udf_truncate_tail_extent(inode); | 106 | udf_truncate_tail_extent(inode); |
| 107 | unlock_kernel(); | 107 | unlock_kernel(); |
| 108 | write_inode_now(inode, 0); | 108 | write_inode_now(inode, 0); |
| 109 | invalidate_inode_buffers(inode); | ||
| 109 | } | 110 | } |
| 110 | iinfo = UDF_I(inode); | 111 | iinfo = UDF_I(inode); |
| 111 | kfree(iinfo->i_ext.i_data); | 112 | kfree(iinfo->i_ext.i_data); |
