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-2.6.28' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
NLM: Set address family before calling nlm_host_rebooted()
nfsd: fix failure to set eof in readdir in some situations

Linus Torvalds e06f42d6 f891caf2

+3
+1
fs/lockd/svc4proc.c
··· 434 434 * reclaim all locks we hold on this server. 435 435 */ 436 436 memset(&saddr, 0, sizeof(saddr)); 437 + saddr.sin_family = AF_INET; 437 438 saddr.sin_addr.s_addr = argp->addr; 438 439 nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state); 439 440
+1
fs/lockd/svcproc.c
··· 466 466 * reclaim all locks we hold on this server. 467 467 */ 468 468 memset(&saddr, 0, sizeof(saddr)); 469 + saddr.sin_family = AF_INET; 469 470 saddr.sin_addr.s_addr = argp->addr; 470 471 nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state); 471 472
+1
fs/nfsd/vfs.c
··· 1912 1912 de = (struct buffered_dirent *)((char *)de + reclen); 1913 1913 } 1914 1914 offset = vfs_llseek(file, 0, SEEK_CUR); 1915 + cdp->err = nfserr_eof; 1915 1916 if (!buf.full) 1916 1917 break; 1917 1918 }