Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e06f42d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f891caf2 d7dc61d0

fs/lockd/svc4proc.c

+1 −0
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, 
	 * reclaim all locks we hold on this server.

	 */

	memset(&saddr, 0, sizeof(saddr));

	saddr.sin_family = AF_INET;

	saddr.sin_addr.s_addr = argp->addr;

	nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state);

fs/lockd/svcproc.c

+1 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, 
	 * reclaim all locks we hold on this server.

	 */

	memset(&saddr, 0, sizeof(saddr));

	saddr.sin_family = AF_INET;

	saddr.sin_addr.s_addr = argp->addr;

	nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state);

fs/nfsd/vfs.c

+1 −0
Original line number Diff line number Diff line
@@ -1912,6 +1912,7 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func, 
			de = (struct buffered_dirent *)((char *)de + reclen);

		}

		offset = vfs_llseek(file, 0, SEEK_CUR);

		cdp->err = nfserr_eof;

		if (!buf.full)

			break;

	}