tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
"Various small fixes for stable"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
CIFS: Fix some return values in case of error in 'crypt_message'
cifs: remove redundant return in cifs_creation_time_get
CIFS: Improve readdir verbosity
CIFS: check if pages is null rather than bv for a failed allocation
CIFS: Set ->should_dirty in cifs_user_readv()

Linus Torvalds a38371cb 3f7ba7e1

+14 -9
+1 -1
fs/cifs/file.c
··· 3271 3271 if (!is_sync_kiocb(iocb)) 3272 3272 ctx->iocb = iocb; 3273 3273 3274 - if (to->type & ITER_IOVEC) 3274 + if (to->type == ITER_IOVEC) 3275 3275 ctx->should_dirty = true; 3276 3276 3277 3277 rc = setup_aio_ctx_iter(ctx, to, READ);
+1 -1
fs/cifs/misc.c
··· 810 810 811 811 if (!pages) { 812 812 pages = vmalloc(max_pages * sizeof(struct page *)); 813 - if (!bv) { 813 + if (!pages) { 814 814 kvfree(bv); 815 815 return -ENOMEM; 816 816 }
+7 -2
fs/cifs/smb1ops.c
··· 849 849 struct cifs_fid *fid, __u16 search_flags, 850 850 struct cifs_search_info *srch_inf) 851 851 { 852 - return CIFSFindFirst(xid, tcon, path, cifs_sb, 853 - &fid->netfid, search_flags, srch_inf, true); 852 + int rc; 853 + 854 + rc = CIFSFindFirst(xid, tcon, path, cifs_sb, 855 + &fid->netfid, search_flags, srch_inf, true); 856 + if (rc) 857 + cifs_dbg(FYI, "find first failed=%d\n", rc); 858 + return rc; 854 859 } 855 860 856 861 static int
+5 -3
fs/cifs/smb2ops.c
··· 982 982 rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL); 983 983 kfree(utf16_path); 984 984 if (rc) { 985 - cifs_dbg(VFS, "open dir failed\n"); 985 + cifs_dbg(FYI, "open dir failed rc=%d\n", rc); 986 986 return rc; 987 987 } 988 988 ··· 992 992 rc = SMB2_query_directory(xid, tcon, fid->persistent_fid, 993 993 fid->volatile_fid, 0, srch_inf); 994 994 if (rc) { 995 - cifs_dbg(VFS, "query directory failed\n"); 995 + cifs_dbg(FYI, "query directory failed rc=%d\n", rc); 996 996 SMB2_close(xid, tcon, fid->persistent_fid, fid->volatile_fid); 997 997 } 998 998 return rc; ··· 1809 1809 1810 1810 sg = init_sg(rqst, sign); 1811 1811 if (!sg) { 1812 - cifs_dbg(VFS, "%s: Failed to init sg %d", __func__, rc); 1812 + cifs_dbg(VFS, "%s: Failed to init sg", __func__); 1813 + rc = -ENOMEM; 1813 1814 goto free_req; 1814 1815 } 1815 1816 ··· 1818 1817 iv = kzalloc(iv_len, GFP_KERNEL); 1819 1818 if (!iv) { 1820 1819 cifs_dbg(VFS, "%s: Failed to alloc IV", __func__); 1820 + rc = -ENOMEM; 1821 1821 goto free_sg; 1822 1822 } 1823 1823 iv[0] = 3;
-2
fs/cifs/xattr.c
··· 188 188 pcreatetime = (__u64 *)value; 189 189 *pcreatetime = CIFS_I(inode)->createtime; 190 190 return sizeof(__u64); 191 - 192 - return rc; 193 191 } 194 192 195 193