diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 08:54:28 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 08:54:28 -0500 |
| commit | d4263348f796f29546f90802177865dd4379dd0a (patch) | |
| tree | adcbdaebae584eee2f32fab95e826e8e49eef385 /fs/befs | |
| parent | be873ac782f5ff5ee6675f83929f4fe6737eead2 (diff) | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'fs/befs')
| -rw-r--r-- | fs/befs/linuxvfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index daa15d6ba450..845d2d690ce2 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
| @@ -324,8 +324,8 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino) | |||
| 324 | befs_debug(sb, "---> befs_read_inode() " "inode = %lu", ino); | 324 | befs_debug(sb, "---> befs_read_inode() " "inode = %lu", ino); |
| 325 | 325 | ||
| 326 | inode = iget_locked(sb, ino); | 326 | inode = iget_locked(sb, ino); |
| 327 | if (IS_ERR(inode)) | 327 | if (!inode) |
| 328 | return inode; | 328 | return ERR_PTR(-ENOMEM); |
| 329 | if (!(inode->i_state & I_NEW)) | 329 | if (!(inode->i_state & I_NEW)) |
| 330 | return inode; | 330 | return inode; |
| 331 | 331 | ||