diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /fs/jfs/jfs_dinode.h | |
parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/jfs/jfs_dinode.h')
-rw-r--r-- | fs/jfs/jfs_dinode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jfs/jfs_dinode.h b/fs/jfs/jfs_dinode.h index c387540d3425..395c4c0d0f06 100644 --- a/fs/jfs/jfs_dinode.h +++ b/fs/jfs/jfs_dinode.h | |||
@@ -170,5 +170,7 @@ struct dinode { | |||
170 | #define JFS_IOC_GETFLAGS _IOR('f', 1, long) | 170 | #define JFS_IOC_GETFLAGS _IOR('f', 1, long) |
171 | #define JFS_IOC_SETFLAGS _IOW('f', 2, long) | 171 | #define JFS_IOC_SETFLAGS _IOW('f', 2, long) |
172 | 172 | ||
173 | #define JFS_IOC_GETFLAGS32 _IOR('f', 1, int) | ||
174 | #define JFS_IOC_SETFLAGS32 _IOW('f', 2, int) | ||
173 | 175 | ||
174 | #endif /*_H_JFS_DINODE */ | 176 | #endif /*_H_JFS_DINODE */ |