diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 13:29:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 13:29:39 -0800 |
| commit | bea4c899f2b5fad80099aea979780ef19f9b1987 (patch) | |
| tree | 65130f4bc91b92e72498fc58bf895d35f2ebf0f2 /fs/xfs/xfs_inode_item.h | |
| parent | 73efc4681cb5e3c8807daf106f001e7f0798d8a0 (diff) | |
| parent | 3fc98b1ac036675b95f6e3fafd5ef147b97d4d30 (diff) | |
| download | kernel_samsung_aries-bea4c899f2b5fad80099aea979780ef19f9b1987.zip kernel_samsung_aries-bea4c899f2b5fad80099aea979780ef19f9b1987.tar.gz kernel_samsung_aries-bea4c899f2b5fad80099aea979780ef19f9b1987.tar.bz2 | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
XFS: Free buffer pages array unconditionally
xfs: kill xfs_bmbt_rec_32/64 types
xfs: improve metadata I/O merging in the elevator
xfs: check for not fully initialized inodes in xfs_ireclaim
Diffstat (limited to 'fs/xfs/xfs_inode_item.h')
| -rw-r--r-- | fs/xfs/xfs_inode_item.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h index 65bae4c..cc8df1a 100644 --- a/fs/xfs/xfs_inode_item.h +++ b/fs/xfs/xfs_inode_item.h @@ -127,7 +127,7 @@ static inline int xfs_ilog_fdata(int w) #ifdef __KERNEL__ struct xfs_buf; -struct xfs_bmbt_rec_64; +struct xfs_bmbt_rec; struct xfs_inode; struct xfs_mount; @@ -140,9 +140,9 @@ typedef struct xfs_inode_log_item { unsigned short ili_flags; /* misc flags */ unsigned short ili_logged; /* flushed logged data */ unsigned int ili_last_fields; /* fields when flushed */ - struct xfs_bmbt_rec_64 *ili_extents_buf; /* array of logged + struct xfs_bmbt_rec *ili_extents_buf; /* array of logged data exts */ - struct xfs_bmbt_rec_64 *ili_aextents_buf; /* array of logged + struct xfs_bmbt_rec *ili_aextents_buf; /* array of logged attr exts */ unsigned int ili_pushbuf_flag; /* one bit used in push_ail */ |