vserver 1.9.3

[linux-2.6.git] / include / linux / reiserfs_fs.h

diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 2a206e8..249ad93 100644 (file)
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -892,8 +892,13 @@ struct stat_data_v1
 #define REISERFS_BARRIER_FL   (EXT2_BARRIER_FL >> 16)
 #define REISERFS_IUNLINK_FL   (EXT2_IUNLINK_FL >> 16)
 
-#define        REISERFS_FL_USER_VISIBLE        0x80FF
-#define        REISERFS_FL_USER_MODIFYABLE     0x80FF
+#ifdef CONFIG_VSERVER_LEGACY
+#define REISERFS_FL_USER_VISIBLE       (REISERFS_IUNLINK_FL|0x80FF)
+#define REISERFS_FL_USER_MODIFYABLE    (REISERFS_IUNLINK_FL|0x80FF)
+#else
+#define REISERFS_FL_USER_VISIBLE       0x80FF
+#define REISERFS_FL_USER_MODIFYABLE    0x80FF
+#endif
 
 /* persistent flags that file inherits from the parent directory */
 #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL |        \
@@ -1741,7 +1746,7 @@ struct reiserfs_transaction_handle {
   int t_blocks_allocated ;      /* number of blocks this writer allocated */
   unsigned long t_trans_id ;    /* sanity check, equals the current trans id */
   void *t_handle_save ;                /* save existing current->journal_info */
-  int displace_new_blocks:1;   /* if new block allocation occurres, that block
+  unsigned displace_new_blocks:1; /* if new block allocation occurres, that block
                                   should be displaced from others */
 } ;
 
@@ -1784,7 +1789,8 @@ int reiserfs_end_persistent_transaction(struct reiserfs_transaction_handle *);
 int reiserfs_commit_page(struct inode *inode, struct page *page,
                unsigned from, unsigned to);
 int reiserfs_flush_old_commits(struct super_block *);
-void reiserfs_commit_for_inode(struct inode *) ;
+int reiserfs_commit_for_inode(struct inode *) ;
+int  reiserfs_inode_needs_commit(struct inode *) ;
 void reiserfs_update_inode_transaction(struct inode *) ;
 void reiserfs_wait_on_write_block(struct super_block *s) ;
 void reiserfs_block_writes(struct reiserfs_transaction_handle *th) ;
@@ -1951,7 +1957,7 @@ void reiserfs_read_locked_inode(struct inode * inode, struct reiserfs_iget_args
 int reiserfs_find_actor(struct inode * inode, void *p) ;
 int reiserfs_init_locked_inode(struct inode * inode, void *p) ;
 void reiserfs_delete_inode (struct inode * inode);
-void reiserfs_write_inode (struct inode * inode, int) ;
+int reiserfs_write_inode (struct inode * inode, int) ;
 struct dentry *reiserfs_get_dentry(struct super_block *, void *) ;
 struct dentry *reiserfs_decode_fh(struct super_block *sb, __u32 *data,
                                      int len, int fhtype,
@@ -2160,9 +2166,9 @@ struct buffer_head * get_FEB (struct tree_balance *);
     int prealloc_size;                 /* is set in determine_prealloc_size() function, used by underlayed
                                         * function that do actual allocation */
 
-    int formatted_node:1;              /* the allocator uses different polices for getting disk space for
+    unsigned formatted_node:1;         /* the allocator uses different polices for getting disk space for
                                         * formatted/unformatted blocks with/without preallocation */
-    int preallocate:1;
+    unsigned preallocate:1;
 };
 
 typedef struct __reiserfs_blocknr_hint reiserfs_blocknr_hint_t;