This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index ba465f7..8e6b4a7 100644 (file)
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -410,6 +410,10 @@ struct reiserfs_sb_info
     struct rw_semaphore xattr_dir_sem;
 
     int j_errno;
+#ifdef CONFIG_QUOTA
+    char *s_qf_names[MAXQUOTAS];
+    int s_jquota_fmt;
+#endif
 };
 
 /* Definitions of reiserfs on-disk properties: */
@@ -457,12 +461,12 @@ enum reiserfs_mount_options {
     REISERFS_POSIXACL,
     REISERFS_BARRIER_NONE,
     REISERFS_BARRIER_FLUSH,
+    REISERFS_TAGXID,
 
     /* Actions on error */
     REISERFS_ERROR_PANIC,
     REISERFS_ERROR_RO,
     REISERFS_ERROR_CONTINUE,
-
     REISERFS_TEST1,
     REISERFS_TEST2,
     REISERFS_TEST3,
@@ -497,7 +501,6 @@ enum reiserfs_mount_options {
 
 #define reiserfs_error_panic(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_ERROR_PANIC))
 #define reiserfs_error_ro(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_ERROR_RO))
-#define reiserfs_error_continue(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_ERROR_CONTINUE))
 
 void reiserfs_file_buffer (struct buffer_head * bh, int list);
 extern struct file_system_type reiserfs_fs_type;