diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /fs/udf/inode.c | |
parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'fs/udf/inode.c')
-rw-r--r-- | fs/udf/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 0506e1173784..3d68de39fad6 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
@@ -167,8 +167,8 @@ void udf_expand_file_adinicb(struct inode * inode, int newsize, int * err) | |||
167 | } | 167 | } |
168 | 168 | ||
169 | page = grab_cache_page(inode->i_mapping, 0); | 169 | page = grab_cache_page(inode->i_mapping, 0); |
170 | if (!PageLocked(page)) | 170 | BUG_ON(!PageLocked(page)); |
171 | PAGE_BUG(page); | 171 | |
172 | if (!PageUptodate(page)) | 172 | if (!PageUptodate(page)) |
173 | { | 173 | { |
174 | kaddr = kmap(page); | 174 | kaddr = kmap(page); |