diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /fs/udf/file.c | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/udf/file.c')
| -rw-r--r-- | fs/udf/file.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index 2faa4172b9f7..bb40d63f328f 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c | |||
| @@ -49,8 +49,7 @@ static int udf_adinicb_readpage(struct file *file, struct page * page) | |||
| 49 | struct inode *inode = page->mapping->host; | 49 | struct inode *inode = page->mapping->host; |
| 50 | char *kaddr; | 50 | char *kaddr; |
| 51 | 51 | ||
| 52 | if (!PageLocked(page)) | 52 | BUG_ON(!PageLocked(page)); |
| 53 | PAGE_BUG(page); | ||
| 54 | 53 | ||
| 55 | kaddr = kmap(page); | 54 | kaddr = kmap(page); |
| 56 | memset(kaddr, 0, PAGE_CACHE_SIZE); | 55 | memset(kaddr, 0, PAGE_CACHE_SIZE); |
| @@ -67,8 +66,7 @@ static int udf_adinicb_writepage(struct page *page, struct writeback_control *wb | |||
| 67 | struct inode *inode = page->mapping->host; | 66 | struct inode *inode = page->mapping->host; |
| 68 | char *kaddr; | 67 | char *kaddr; |
| 69 | 68 | ||
| 70 | if (!PageLocked(page)) | 69 | BUG_ON(!PageLocked(page)); |
| 71 | PAGE_BUG(page); | ||
| 72 | 70 | ||
| 73 | kaddr = kmap(page); | 71 | kaddr = kmap(page); |
| 74 | memcpy(UDF_I_DATA(inode) + UDF_I_LENEATTR(inode), kaddr, inode->i_size); | 72 | memcpy(UDF_I_DATA(inode) + UDF_I_LENEATTR(inode), kaddr, inode->i_size); |