linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / smbfs / file.c

diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c
index dae6704..7042e62 100644 (file)
--- a/fs/smbfs/file.c
+++ b/fs/smbfs/file.c
@@ -178,9 +178,11 @@ smb_writepage(struct page *page, struct writeback_control *wbc)
        unsigned offset = PAGE_CACHE_SIZE;
        int err;
 
-       BUG_ON(!mapping);
+       if (!mapping)
+               BUG();
        inode = mapping->host;
-       BUG_ON(!inode);
+       if (!inode)
+               BUG();
 
        end_index = inode->i_size >> PAGE_CACHE_SHIFT;
 
@@ -306,7 +308,7 @@ static int smb_commit_write(struct file *file, struct page *page,
        return status;
 }
 
-const struct address_space_operations smb_file_aops = {
+struct address_space_operations smb_file_aops = {
        .readpage = smb_readpage,
        .writepage = smb_writepage,
        .prepare_write = smb_prepare_write,
@@ -399,7 +401,7 @@ smb_file_permission(struct inode *inode, int mask, struct nameidata *nd)
        return error;
 }
 
-const struct file_operations smb_file_operations =
+struct file_operations smb_file_operations =
 {
        .llseek         = remote_llseek,
        .read           = smb_file_read,