Merge tag 'nfs-for-4.9-2' of git://git.linux-nfs.org/projects/anna/linux-nfs (02593ac6) · Commits · 戴 / test

Pull NFS client bugfixes from Anna Schumaker: "Just two bugfixes this time: Stable bugfix: - Fix last_write_offset incorrectly set to page boundary Other bugfix: - Fix missing-braces warning" * tag 'nfs-for-4.9-2' of git://git.linux-nfs.org/projects/anna/linux-nfs: nfs4: fix missing-braces warning pnfs/blocklayout: fix last_write_offset incorrectly set to page boundary

fs/nfs/blocklayout/blocklayout.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -344,9 +344,10 @@ static void bl_write_cleanup(struct work_struct *work)
		u64 start = hdr->args.offset & (loff_t)PAGE_MASK;
		u64 end = (hdr->args.offset + hdr->args.count +
		PAGE_SIZE - 1) & (loff_t)PAGE_MASK;
		u64 lwb = hdr->args.offset + hdr->args.count;

		ext_tree_mark_written(bl, start >> SECTOR_SHIFT,
		(end - start) >> SECTOR_SHIFT, end);
		(end - start) >> SECTOR_SHIFT, lwb);
		}

		pnfs_ld_write_done(hdr);

fs/nfs/nfs4proc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1545,7 +1545,7 @@ static int update_open_stateid(struct nfs4_state *state,
		struct nfs_client *clp = server->nfs_client;
		struct nfs_inode *nfsi = NFS_I(state->inode);
		struct nfs_delegation *deleg_cur;
		nfs4_stateid freeme = {0};
		nfs4_stateid freeme = { };
		int ret = 0;

		fmode &= (FMODE_READ\|FMODE_WRITE);

Admin message