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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: free nativeFileSystem field before allocating a new one
[CIFS] Distinguish posix opens and mkdirs from legacy mkdirs in stats

Linus Torvalds eb872c15 ae42b9e1

+14 -2
+7 -1
fs/cifs/cifs_debug.c
··· 261 261 atomic_set(&tcon->num_reads, 0); 262 262 atomic_set(&tcon->num_oplock_brks, 0); 263 263 atomic_set(&tcon->num_opens, 0); 264 + atomic_set(&tcon->num_posixopens, 0); 265 + atomic_set(&tcon->num_posixmkdirs, 0); 264 266 atomic_set(&tcon->num_closes, 0); 265 267 atomic_set(&tcon->num_deletes, 0); 266 268 atomic_set(&tcon->num_mkdirs, 0); ··· 349 347 atomic_read(&tcon->num_locks), 350 348 atomic_read(&tcon->num_hardlinks), 351 349 atomic_read(&tcon->num_symlinks)); 352 - seq_printf(m, "\nOpens: %d Closes: %d" 350 + seq_printf(m, "\nOpens: %d Closes: %d " 353 351 "Deletes: %d", 354 352 atomic_read(&tcon->num_opens), 355 353 atomic_read(&tcon->num_closes), 356 354 atomic_read(&tcon->num_deletes)); 355 + seq_printf(m, "\nPosix Opens: %d " 356 + "Posix Mkdirs: %d", 357 + atomic_read(&tcon->num_posixopens), 358 + atomic_read(&tcon->num_posixmkdirs)); 357 359 seq_printf(m, "\nMkdirs: %d Rmdirs: %d", 358 360 atomic_read(&tcon->num_mkdirs), 359 361 atomic_read(&tcon->num_rmdirs));
+2
fs/cifs/cifsglob.h
··· 260 260 atomic_t num_closes; 261 261 atomic_t num_deletes; 262 262 atomic_t num_mkdirs; 263 + atomic_t num_posixopens; 264 + atomic_t num_posixmkdirs; 263 265 atomic_t num_rmdirs; 264 266 atomic_t num_renames; 265 267 atomic_t num_t2renames;
+4 -1
fs/cifs/cifssmb.c
··· 1113 1113 psx_create_err: 1114 1114 cifs_buf_release(pSMB); 1115 1115 1116 - cifs_stats_inc(&tcon->num_mkdirs); 1116 + if (posix_flags & SMB_O_DIRECTORY) 1117 + cifs_stats_inc(&tcon->num_posixmkdirs); 1118 + else 1119 + cifs_stats_inc(&tcon->num_posixopens); 1117 1120 1118 1121 if (rc == -EAGAIN) 1119 1122 goto PsxCreat;
+1
fs/cifs/connect.c
··· 2726 2726 strncpy(tcon->treeName, tree, MAX_TREE_SIZE); 2727 2727 2728 2728 /* mostly informational -- no need to fail on error here */ 2729 + kfree(tcon->nativeFileSystem); 2729 2730 tcon->nativeFileSystem = cifs_strndup_from_ucs(bcc_ptr, 2730 2731 bytes_left, is_unicode, 2731 2732 nls_codepage);