diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /fs/xfs/xfs_dir2_data.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'fs/xfs/xfs_dir2_data.h')
| -rw-r--r-- | fs/xfs/xfs_dir2_data.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_dir2_data.h b/fs/xfs/xfs_dir2_data.h index 0847cbb53e17..a6ae2d21c40a 100644 --- a/fs/xfs/xfs_dir2_data.h +++ b/fs/xfs/xfs_dir2_data.h | |||
| @@ -85,11 +85,11 @@ typedef struct xfs_dir2_data_hdr { | |||
| 85 | * Tag appears as the last 2 bytes. | 85 | * Tag appears as the last 2 bytes. |
| 86 | */ | 86 | */ |
| 87 | typedef struct xfs_dir2_data_entry { | 87 | typedef struct xfs_dir2_data_entry { |
| 88 | xfs_ino_t inumber; /* inode number */ | 88 | __be64 inumber; /* inode number */ |
| 89 | __uint8_t namelen; /* name length */ | 89 | __u8 namelen; /* name length */ |
| 90 | __uint8_t name[1]; /* name bytes, no null */ | 90 | __u8 name[1]; /* name bytes, no null */ |
| 91 | /* variable offset */ | 91 | /* variable offset */ |
| 92 | xfs_dir2_data_off_t tag; /* starting offset of us */ | 92 | __be16 tag; /* starting offset of us */ |
| 93 | } xfs_dir2_data_entry_t; | 93 | } xfs_dir2_data_entry_t; |
| 94 | 94 | ||
| 95 | /* | 95 | /* |