History

Merge tag 'nfs-for-4.9-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

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

Linus Torvalds committed 10 years ago

Commit 02593ac2 parents 43ef55d 83aa3e02 files · +3 −2Browse files

Unified · Split

2 files
  1. fs/nfs/blocklayout/blocklayout.c +2 −1
  2. fs/nfs/nfs4proc.c +1 −1
fs/nfs/blocklayout/blocklayout.c+2−1
@@ -344,9 +344,10 @@ static void bl_write_cleanup(struct work_struct *work) · 343 unmodified lines
344 u64 start = hdr->args.offset & (loff_t)PAGE_MASK;344 u64 start = hdr->args.offset & (loff_t)PAGE_MASK;
345 u64 end = (hdr->args.offset + hdr->args.count +345 u64 end = (hdr->args.offset + hdr->args.count +
346 PAGE_SIZE - 1) & (loff_t)PAGE_MASK;346 PAGE_SIZE - 1) & (loff_t)PAGE_MASK;
347 u64 lwb = hdr->args.offset + hdr->args.count;
347 348
348 ext_tree_mark_written(bl, start >> SECTOR_SHIFT,349 ext_tree_mark_written(bl, start >> SECTOR_SHIFT,
349 (end - start) >> SECTOR_SHIFT, end);350 (end - start) >> SECTOR_SHIFT, lwb);
350 }351 }
351 352
352 pnfs_ld_write_done(hdr);353 pnfs_ld_write_done(hdr);
fs/nfs/nfs4proc.c+1−1
@@ -1545,7 +1545,7 @@ static int update_open_stateid(struct nfs4_state *state, · 1544 unmodified lines
1545 struct nfs_client *clp = server->nfs_client;1545 struct nfs_client *clp = server->nfs_client;
1546 struct nfs_inode *nfsi = NFS_I(state->inode);1546 struct nfs_inode *nfsi = NFS_I(state->inode);
1547 struct nfs_delegation *deleg_cur;1547 struct nfs_delegation *deleg_cur;
1548 nfs4_stateid freeme = {0};1548 nfs4_stateid freeme = { };
1549 int ret = 0;1549 int ret = 0;
1550 1550
1551 fmode &= (FMODE_READ|FMODE_WRITE);1551 fmode &= (FMODE_READ|FMODE_WRITE);