diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 13:06:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 13:06:20 -0700 |
| commit | 8769e078a9a2bce13d39c08e0e5a513f5320e1de (patch) | |
| tree | 4f63f3e0179a5b0a17f961f86e775393c8cf1732 /fs/xfs/xfs_inode.c | |
| parent | 8cbc95ee748741939222c3d38584a40c92bedcdd (diff) | |
| parent | 7dfbcbefad4b24d9822d04dbd7b5dd5c3fd45076 (diff) | |
| download | lwn-8769e078a9a2bce13d39c08e0e5a513f5320e1de.tar.gz lwn-8769e078a9a2bce13d39c08e0e5a513f5320e1de.zip | |
Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs
Pull xfs update (#2) from Ben Myers:
- add CONFIG_XFS_WARN, a step between zero debugging and
CONFIG_XFS_DEBUG.
- fix attrmulti and attrlist to fall back to vmalloc when kmalloc
fails.
* tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs:
xfs: fallback to vmalloc for large buffers in xfs_compat_attrlist_by_handle
xfs: fallback to vmalloc for large buffers in xfs_attrlist_by_handle
xfs: introduce CONFIG_XFS_WARN
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 558ef4947206..efbe1accb6ca 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -287,7 +287,7 @@ xfs_ilock_demote( trace_xfs_ilock_demote(ip, lock_flags, _RET_IP_); } -#ifdef DEBUG +#if defined(DEBUG) || defined(XFS_WARN) int xfs_isilocked( xfs_inode_t *ip, |