diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 23:37:17 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 23:37:17 -0200 |
| commit | 53e3ccfd153f0e71352b34a930e231ac1ae07d5e (patch) | |
| tree | b369d99756a8ddf7ebd9b13cc9c011bf9bd32ba4 /fs/xfs/xfs_log.c | |
| parent | 5e442a493fc59fa536c76db1fff5b49ca36a88c5 (diff) | |
| parent | 810627d9a6d0e8820c798001875bc4e1b7754ebf (diff) | |
| download | linux-53e3ccfd153f0e71352b34a930e231ac1ae07d5e.tar.bz2 | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: fix force shutdown handling in xfs_end_io
xfs: constify xfs_item_ops
xfs: Fix possible memory corruption in xfs_readlink
Diffstat (limited to 'fs/xfs/xfs_log.c')
| -rw-r--r-- | fs/xfs/xfs_log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 2758a6277c52..a14cd89fe465 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -626,7 +626,7 @@ xfs_log_item_init( struct xfs_mount *mp, struct xfs_log_item *item, int type, - struct xfs_item_ops *ops) + const struct xfs_item_ops *ops) { item->li_mountp = mp; item->li_ailp = mp->m_ail; |