projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
[powerpc.git]
/
fs
/
smbfs
/
file.c
diff --git
a/fs/smbfs/file.c
b/fs/smbfs/file.c
index
c56bd99
..
dae6704
100644
(file)
--- a/
fs/smbfs/file.c
+++ b/
fs/smbfs/file.c
@@
-178,11
+178,9
@@
smb_writepage(struct page *page, struct writeback_control *wbc)
unsigned offset = PAGE_CACHE_SIZE;
int err;
unsigned offset = PAGE_CACHE_SIZE;
int err;
- if (!mapping)
- BUG();
+ BUG_ON(!mapping);
inode = mapping->host;
inode = mapping->host;
- if (!inode)
- BUG();
+ BUG_ON(!inode);
end_index = inode->i_size >> PAGE_CACHE_SHIFT;
end_index = inode->i_size >> PAGE_CACHE_SHIFT;
@@
-308,7
+306,7
@@
static int smb_commit_write(struct file *file, struct page *page,
return status;
}
return status;
}
-struct address_space_operations smb_file_aops = {
+
const
struct address_space_operations smb_file_aops = {
.readpage = smb_readpage,
.writepage = smb_writepage,
.prepare_write = smb_prepare_write,
.readpage = smb_readpage,
.writepage = smb_writepage,
.prepare_write = smb_prepare_write,