linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / jfs / jfs_inode.c

diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index 9ba919e..4340659 100644 (file)
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -27,66 +27,6 @@
 #include "jfs_dinode.h"
 #include "jfs_debug.h"
 
-
-void jfs_set_inode_flags(struct inode *inode)
-{
-       unsigned int flags = JFS_IP(inode)->mode2;
-
-       inode->i_flags &= ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER |
-               S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
-
-       if (flags & JFS_IMMUTABLE_FL)
-               inode->i_flags |= S_IMMUTABLE;
-       if (flags & JFS_IUNLINK_FL)
-               inode->i_flags |= S_IUNLINK;
-       if (flags & JFS_BARRIER_FL)
-               inode->i_flags |= S_BARRIER;
-
-       if (flags & JFS_SYNC_FL)
-               inode->i_flags |= S_SYNC;
-       if (flags & JFS_APPEND_FL)
-               inode->i_flags |= S_APPEND;
-       if (flags & JFS_NOATIME_FL)
-               inode->i_flags |= S_NOATIME;
-       if (flags & JFS_DIRSYNC_FL)
-               inode->i_flags |= S_DIRSYNC;
-}
-
-int jfs_sync_flags(struct inode *inode)
-{
-       unsigned int oldflags, newflags;
-
-       oldflags = JFS_IP(inode)->mode2;
-       newflags = oldflags & ~(JFS_APPEND_FL |
-               JFS_IMMUTABLE_FL | JFS_IUNLINK_FL |
-               JFS_BARRIER_FL | JFS_NOATIME_FL |
-               JFS_SYNC_FL | JFS_DIRSYNC_FL);
-
-       if (IS_APPEND(inode))
-               newflags |= JFS_APPEND_FL;
-       if (IS_IMMUTABLE(inode))
-               newflags |= JFS_IMMUTABLE_FL;
-       if (IS_IUNLINK(inode))
-               newflags |= JFS_IUNLINK_FL;
-       if (IS_BARRIER(inode))
-               newflags |= JFS_BARRIER_FL;
-
-       /* we do not want to copy superblock flags */
-       if (inode->i_flags & S_NOATIME)
-               newflags |= JFS_NOATIME_FL;
-       if (inode->i_flags & S_SYNC)
-               newflags |= JFS_SYNC_FL;
-       if (inode->i_flags & S_DIRSYNC)
-               newflags |= JFS_DIRSYNC_FL;
-
-       if (oldflags ^ newflags) {
-               JFS_IP(inode)->mode2 = newflags;
-               inode->i_ctime = CURRENT_TIME;
-               mark_inode_dirty(inode);
-       }
-       return 0;
-}
-
 /*
  * NAME:       ialloc()
  *
@@ -124,13 +64,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        } else
                inode->i_gid = current->fsgid;
 
-       /*
-        * New inodes need to save sane values on disk when
-        * uid & gid mount options are used
-        */
-       jfs_inode->saved_uid = inode->i_uid;
-       jfs_inode->saved_gid = inode->i_gid;
-
        inode->i_xid = vx_current_fsxid(sb);
        if (DLIMIT_ALLOC_INODE(inode)) {
                iput(inode);
@@ -150,20 +83,11 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        }
 
        inode->i_mode = mode;
-       /* inherit flags from parent */
-       jfs_inode->mode2 = JFS_IP(parent)->mode2 & JFS_FL_INHERIT;
-
-       if (S_ISDIR(mode)) {
-               jfs_inode->mode2 |= IDIRECTORY;
-               jfs_inode->mode2 &= ~JFS_DIRSYNC_FL;
-       }
-       else {
-               jfs_inode->mode2 |= INLINEEA | ISPARSE;
-               if (S_ISLNK(mode))
-                       jfs_inode->mode2 &= ~(JFS_IMMUTABLE_FL|JFS_APPEND_FL);
-       }
-       jfs_inode->mode2 |= mode;
-
+       if (S_ISDIR(mode))
+               jfs_inode->mode2 = IDIRECTORY | mode;
+       else
+               jfs_inode->mode2 = INLINEEA | ISPARSE | mode;
+       inode->i_blksize = sb->s_blocksize;
        inode->i_blocks = 0;
        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
        jfs_inode->otime = inode->i_ctime.tv_sec;
@@ -183,7 +107,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        jfs_inode->atlhead = 0;
        jfs_inode->atltail = 0;
        jfs_inode->xtlid = 0;
-       jfs_set_inode_flags(inode);
 
        jfs_info("ialloc returns inode = 0x%p\n", inode);