diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
| commit | 9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch) | |
| tree | b19e6acb5a67af31a4e7742e05c2166dc3f1444c /fs/smbfs | |
| parent | 72919904796333a20c6a5d5c380091b42e407aa9 (diff) | |
Merge with Linux 2.3.22.
Diffstat (limited to 'fs/smbfs')
| -rw-r--r-- | fs/smbfs/cache.c | 2 | ||||
| -rw-r--r-- | fs/smbfs/inode.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/smbfs/cache.c b/fs/smbfs/cache.c index 14d61aba0..950ecb3c1 100644 --- a/fs/smbfs/cache.c +++ b/fs/smbfs/cache.c @@ -34,7 +34,7 @@ printk_name(const char *name, int len) len = 80; strncpy(buf, name, len); buf[len] = 0; - printk(buf); + printk("%s", buf); } #endif diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 419adf970..b4dcc2a32 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c @@ -75,6 +75,8 @@ smb_iget(struct super_block *sb, struct smb_fattr *fattr) pr_debug("smb_iget: %p\n", fattr); result = get_empty_inode(); + if (!result) + return result; result->i_sb = sb; result->i_dev = sb->s_dev; result->i_ino = fattr->f_ino; |