diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /fs/freevxfs/vxfs_dir.h | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'fs/freevxfs/vxfs_dir.h')
| -rw-r--r-- | fs/freevxfs/vxfs_dir.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/freevxfs/vxfs_dir.h b/fs/freevxfs/vxfs_dir.h index 8a4dfef1ddad..3c96d6e63978 100644 --- a/fs/freevxfs/vxfs_dir.h +++ b/fs/freevxfs/vxfs_dir.h | |||
| @@ -80,7 +80,7 @@ struct vxfs_direct { | |||
| 80 | * a d_name with size len. | 80 | * a d_name with size len. |
| 81 | */ | 81 | */ |
| 82 | #define VXFS_DIRPAD 4 | 82 | #define VXFS_DIRPAD 4 |
| 83 | #define VXFS_NAMEMIN ((int)((struct vxfs_direct *)0)->d_name) | 83 | #define VXFS_NAMEMIN offsetof(struct vxfs_direct, d_name) |
| 84 | #define VXFS_DIRROUND(len) ((VXFS_DIRPAD + (len) - 1) & ~(VXFS_DIRPAD -1)) | 84 | #define VXFS_DIRROUND(len) ((VXFS_DIRPAD + (len) - 1) & ~(VXFS_DIRPAD -1)) |
| 85 | #define VXFS_DIRLEN(len) (VXFS_DIRROUND(VXFS_NAMEMIN + (len))) | 85 | #define VXFS_DIRLEN(len) (VXFS_DIRROUND(VXFS_NAMEMIN + (len))) |
| 86 | 86 | ||