nilfs2: replace BUG_ON and BUG calls triggerable from ioctl

[linux-2.6-omap-h63xx.git] / fs / nilfs2 / nilfs.h

diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h
index f767644a72420f0c9eb16cd9c988785e5a55d18c..a7f5bc724e337ad42fa269fe8d7b772f732edf24 100644 (file)
--- a/fs/nilfs2/nilfs.h
+++ b/fs/nilfs2/nilfs.h
@@ -173,7 +173,6 @@ static inline void nilfs_set_transaction_flag(unsigned int flag)
 {
        struct nilfs_transaction_info *ti = current->journal_info;
 
-       BUG_ON(!ti);
        ti->ti_flags |= flag;
 }
 
@@ -242,7 +241,7 @@ extern void nilfs_set_link(struct inode *, struct nilfs_dir_entry *,
 extern int nilfs_sync_file(struct file *, struct dentry *, int);
 
 /* ioctl.c */
-int nilfs_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
+long nilfs_ioctl(struct file *, unsigned int, unsigned long);
 int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *, void __user *);
 
 /* inode.c */