diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:22:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:22:57 -0500 |
| commit | 47853e7fa588bef826c9799a87b33904b32bd905 (patch) | |
| tree | bd7681d1aedf28125b86fb0218e64297f4d71ac9 /fs/nfs/callback_proc.c | |
| parent | 221fc10ec89834329e5613e3cab4569ba22da410 (diff) | |
| parent | 9e56904e41e242169007e69d9916059dab995d90 (diff) | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'fs/nfs/callback_proc.c')
| -rw-r--r-- | fs/nfs/callback_proc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 65f1e19e4d19..462cfceb50c5 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c | |||
| @@ -35,7 +35,9 @@ unsigned nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres | |||
| 35 | if (delegation == NULL || (delegation->type & FMODE_WRITE) == 0) | 35 | if (delegation == NULL || (delegation->type & FMODE_WRITE) == 0) |
| 36 | goto out_iput; | 36 | goto out_iput; |
| 37 | res->size = i_size_read(inode); | 37 | res->size = i_size_read(inode); |
| 38 | res->change_attr = NFS_CHANGE_ATTR(inode); | 38 | res->change_attr = delegation->change_attr; |
| 39 | if (nfsi->npages != 0) | ||
| 40 | res->change_attr++; | ||
| 39 | res->ctime = inode->i_ctime; | 41 | res->ctime = inode->i_ctime; |
| 40 | res->mtime = inode->i_mtime; | 42 | res->mtime = inode->i_mtime; |
| 41 | res->bitmap[0] = (FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE) & | 43 | res->bitmap[0] = (FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE) & |