diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:48:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:48:03 -0700 |
commit | 0f1bce41fed02e45f31c2409f29e69e1fedebcdc (patch) | |
tree | 21cde215291e59ccc5e10fadd74fbfc6206832ae /include | |
parent | da1ba891f22835db9a2c349315c3763e9f4e4e67 (diff) | |
parent | 9afadc4b1fd25337003832c9a4668f9bd42cdda9 (diff) | |
download | op-kernel-dev-0f1bce41fed02e45f31c2409f29e69e1fedebcdc.zip op-kernel-dev-0f1bce41fed02e45f31c2409f29e69e1fedebcdc.tar.gz |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: Fix memory corruption when fs mounted with noadinicb option
udf: Make udf exportable
udf: fs/udf/partition.c:udf_get_pblock() mustn't be inline
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/exportfs.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h index de8387b..f5abd13 100644 --- a/include/linux/exportfs.h +++ b/include/linux/exportfs.h @@ -33,6 +33,19 @@ enum fid_type { * 32 bit parent directory inode number. */ FILEID_INO32_GEN_PARENT = 2, + + /* + * 32 bit block number, 16 bit partition reference, + * 16 bit unused, 32 bit generation number. + */ + FILEID_UDF_WITHOUT_PARENT = 0x51, + + /* + * 32 bit block number, 16 bit partition reference, + * 16 bit unused, 32 bit generation number, + * 32 bit parent block number, 32 bit parent generation number + */ + FILEID_UDF_WITH_PARENT = 0x52, }; struct fid { @@ -43,6 +56,14 @@ struct fid { u32 parent_ino; u32 parent_gen; } i32; + struct { + u32 block; + u16 partref; + u16 parent_partref; + u32 generation; + u32 parent_block; + u32 parent_generation; + } udf; __u32 raw[0]; }; }; |