Merge branch 'master' into 83xx

[linux-2.6] / fs / coda / cnode.c

diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c
index 23aeef5aa8144a94dc69ea5abfc29ab286da77d7..28c872747f8170f45aa490987cfae07a80f7eee5 100644 (file)
--- a/fs/coda/cnode.c
+++ b/fs/coda/cnode.c
@@ -16,7 +16,7 @@ static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2)
        return memcmp(fid1, fid2, sizeof(*fid1)) == 0;
 }
 
-static struct inode_operations coda_symlink_inode_operations = {
+static const struct inode_operations coda_symlink_inode_operations = {
        .readlink       = generic_readlink,
        .follow_link    = page_follow_link_light,
        .put_link       = page_put_link,
@@ -120,8 +120,7 @@ void coda_replace_fid(struct inode *inode, struct CodaFid *oldfid,
        
        cii = ITOC(inode);
 
-       if (!coda_fideq(&cii->c_fid, oldfid))
-               BUG();
+       BUG_ON(!coda_fideq(&cii->c_fid, oldfid));
 
        /* replace fid and rehash inode */
        /* XXX we probably need to hold some lock here! */