V4L/DVB (11310): cx18: remove intermediate 'ioctl' step

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

diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h
index fcb9231bb9edac22b09593d8fa1d5e80624cde6a..69b3427d7885e0a42e1caa65a22c1ab79d5b015d 100644 (file)
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h
@@ -23,7 +23,7 @@ struct ufs_sb_info {
 struct ufs_inode_info {
        union {
                __fs32  i_data[15];
-               __u8    i_symlink[4*15];
+               __u8    i_symlink[2 * 4 * 15];
                __fs64  u2_i_data[15];
        } i_u1;
        __u32   i_flags;
@@ -66,7 +66,7 @@ struct ufs_inode_info {
 #ifdef CONFIG_UFS_DEBUG
 #      define UFSD(f, a...)    {                                       \
                printk ("UFSD (%s, %d): %s:",                           \
-                       __FILE__, __LINE__, __FUNCTION__);              \
+                       __FILE__, __LINE__, __func__);          \
                printk (f, ## a);                                       \
        }
 #else
@@ -107,7 +107,6 @@ extern struct inode * ufs_new_inode (struct inode *, int);
 
 /* inode.c */
 extern struct inode *ufs_iget(struct super_block *, unsigned long);
-extern void ufs_put_inode (struct inode *);
 extern int ufs_write_inode (struct inode *, int);
 extern int ufs_sync_inode (struct inode *);
 extern void ufs_delete_inode (struct inode *);