diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-06 14:25:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-06 14:25:27 +0100 |
| commit | a52afea68f94d2501b7fe1fa18cc6acf84e35a76 (patch) | |
| tree | 977eb066b9de1bea4e7ce7ea9a5583d00279061f /fs/xfs/xfs_inode.c | |
| parent | 8b28c93fe5a55873ce22b7126e84eb59290f8603 (diff) | |
| parent | d7e3281b52fea8917fb4a7a5b09df5e6a9d2850c (diff) | |
Merge tag 'asoc-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Changes for v4.1
A selection of changes for v4.1 so far. The main things are:
- Move of jack registration to the card where it belongs.
- Support for DAPM routes specified by both the machine driver and DT.
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index daafa1f6d260..6163767aa856 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2867,6 +2867,10 @@ xfs_rename( * Handle RENAME_EXCHANGE flags */ if (flags & RENAME_EXCHANGE) { + if (target_ip == NULL) { + error = -EINVAL; + goto error_return; + } error = xfs_cross_rename(tp, src_dp, src_name, src_ip, target_dp, target_name, target_ip, &free_list, &first_block, spaceres); |