~ubuntu-branches/ubuntu/precise/util-linux/precise-proposed

« back to all changes in this revision

Viewing changes to shlibs/blkid/src/superblocks/ext.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-06-20 22:31:50 UTC
  • mfrom: (1.6.3 upstream) (4.5.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110620223150-lz8wrv0946ihcz3z
Tags: 2.19.1-2ubuntu1
* Merge from Debian unstable, remaining changes:
  - Build for multiarch.
  - Add pre-depends on multiarch-support.
  - configure.ac: don't try to be clever about extracting a path name from
    $libdir to append to /usr in a way that's not overridable; instead,
    reuse the built-in configurable libexecdir.
  - Fix up the .pc.in files to know about libexecdir, so our substitutions
    don't leave us with unusable pkg-config files.
  - Install custom blkid.conf to use /dev/.blkid.tab since we don't
    expect device names to survive a reboot
  - Mention mountall(8) in fstab(5) manpages, along with its special
    options.
  - Since upstart is required in Ubuntu, the hwclock.sh init script is not
    called on startup and the hwclockfirst.sh init script is removed.
  - Drop depends on initscripts for the above.
  - Replace hwclock udev rule with an Upstart job.
  - For the case where mount is called with a directory to mount, look
    that directory up in mountall's /lib/init/fstab if we couldn't find
    it mentioned anywhere else.  This means "mount /proc", "mount /sys",
    etc. work.
  - mount.8 points to the cifs-utils package, not the obsolete smbfs one. 
* Dropped changes:
  - mount.preinst: lsb_release has been fixed in lucid and above to be
    usable without configuration, so we don't have to diverge from Debian
    here anymore.
* Changes merged upstream:
  - sfdisk support for '+' with '-N'
  - mount/umount.c: fix a segfault on umount with empty mtab entry
  - Fix arbitrary unmount with fuse security issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
131
131
#define EXT3_FEATURE_INCOMPAT_UNSUPPORTED       ~EXT3_FEATURE_INCOMPAT_SUPP
132
132
#define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED      ~EXT3_FEATURE_RO_COMPAT_SUPP
133
133
 
134
 
 
135
 
#ifdef FUCK
136
 
 
137
 
/* for s_flags */
138
 
#define EXT2_FLAGS_TEST_FILESYS                 0x0004
139
 
 
140
 
/* for s_feature_compat */
141
 
#define EXT3_FEATURE_COMPAT_HAS_JOURNAL         0x0004
142
 
 
143
 
/* for s_feature_ro_compat */
144
 
#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER     0x0001
145
 
#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE       0x0002
146
 
#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR        0x0004
147
 
#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE        0x0008
148
 
#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM         0x0010
149
 
#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK        0x0020
150
 
#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE      0x0040
151
 
 
152
 
/* for s_feature_incompat */
153
 
#define EXT2_FEATURE_INCOMPAT_FILETYPE          0x0002
154
 
#define EXT3_FEATURE_INCOMPAT_RECOVER           0x0004
155
 
#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV       0x0008
156
 
#define EXT2_FEATURE_INCOMPAT_META_BG           0x0010
157
 
#define EXT4_FEATURE_INCOMPAT_EXTENTS           0x0040 /* extents support */
158
 
#define EXT4_FEATURE_INCOMPAT_64BIT             0x0080
159
 
#define EXT4_FEATURE_INCOMPAT_MMP               0x0100
160
 
#define EXT4_FEATURE_INCOMPAT_FLEX_BG           0x0200
161
 
 
162
 
#define EXT2_FEATURE_RO_COMPAT_SUPP     (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
163
 
                                         EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
164
 
                                         EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
165
 
#define EXT2_FEATURE_INCOMPAT_SUPP      (EXT2_FEATURE_INCOMPAT_FILETYPE| \
166
 
                                         EXT2_FEATURE_INCOMPAT_META_BG)
167
 
#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED       ~EXT2_FEATURE_INCOMPAT_SUPP
168
 
#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED      ~EXT2_FEATURE_RO_COMPAT_SUPP
169
 
 
170
 
#define EXT3_FEATURE_RO_COMPAT_SUPP     (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
171
 
                                         EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
172
 
                                         EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
173
 
#define EXT3_FEATURE_INCOMPAT_SUPP      (EXT2_FEATURE_INCOMPAT_FILETYPE| \
174
 
                                         EXT3_FEATURE_INCOMPAT_RECOVER| \
175
 
                                         EXT2_FEATURE_INCOMPAT_META_BG)
176
 
#define EXT3_FEATURE_INCOMPAT_UNSUPPORTED       (~EXT3_FEATURE_INCOMPAT_SUPP)
177
 
#define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED      (~EXT3_FEATURE_RO_COMPAT_SUPP)
178
 
 
179
 
#endif
180
 
 
181
134
/*
182
135
 * Check to see if a filesystem is in /proc/filesystems.
183
136
 * Returns 1 if found, 0 if not