[PATCH] Debug variants of linked list macros

[linux-2.6] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index ca695fc8d69cb3ab21b893764c6c7c6edcfc9239..8f74dfbb2edd256c312b5db9efdc33e4cbeb3cbd 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -512,7 +512,6 @@ struct inode {
        struct timespec         i_mtime;
        struct timespec         i_ctime;
        unsigned int            i_blkbits;
-       unsigned long           i_blksize;
        unsigned long           i_version;
        blkcnt_t                i_blocks;
        unsigned short          i_bytes;
@@ -531,9 +530,9 @@ struct inode {
        struct list_head        i_devices;
        union {
                struct pipe_inode_info  *i_pipe;
+               struct block_device     *i_bdev;
+               struct cdev             *i_cdev;
        };
-       struct block_device     *i_bdev;
-       struct cdev             *i_cdev;
        int                     i_cindex;
 
        __u32                   i_generation;