diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
| commit | 0a0fc0ddbe732779366ab6b1b879f62195e65967 (patch) | |
| tree | 7b42490a676cf39ae0691b6859ecf7fd410f229b /fs/nfs/callback_proc.c | |
| parent | 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a (diff) | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
Merge with /home/shaggy/git/linus-clean/
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) & |