diff options
| -rw-r--r-- | fs/nfs/dir.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 476cb0f837fd..ae04892a5e5d 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
| @@ -154,7 +154,6 @@ typedef struct { | |||
| 154 | struct nfs_entry *entry; | 154 | struct nfs_entry *entry; |
| 155 | decode_dirent_t decode; | 155 | decode_dirent_t decode; |
| 156 | int plus; | 156 | int plus; |
| 157 | int error; | ||
| 158 | unsigned long timestamp; | 157 | unsigned long timestamp; |
| 159 | int timestamp_valid; | 158 | int timestamp_valid; |
| 160 | } nfs_readdir_descriptor_t; | 159 | } nfs_readdir_descriptor_t; |
| @@ -213,7 +212,6 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page) | |||
| 213 | return 0; | 212 | return 0; |
| 214 | error: | 213 | error: |
| 215 | unlock_page(page); | 214 | unlock_page(page); |
| 216 | desc->error = error; | ||
| 217 | return -EIO; | 215 | return -EIO; |
| 218 | } | 216 | } |
| 219 | 217 | ||
| @@ -483,13 +481,13 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent, | |||
| 483 | goto out; | 481 | goto out; |
| 484 | } | 482 | } |
| 485 | timestamp = jiffies; | 483 | timestamp = jiffies; |
| 486 | desc->error = NFS_PROTO(inode)->readdir(file->f_path.dentry, cred, *desc->dir_cookie, | 484 | status = NFS_PROTO(inode)->readdir(file->f_path.dentry, cred, |
| 487 | page, | 485 | *desc->dir_cookie, page, |
| 488 | NFS_SERVER(inode)->dtsize, | 486 | NFS_SERVER(inode)->dtsize, |
| 489 | desc->plus); | 487 | desc->plus); |
| 490 | desc->page = page; | 488 | desc->page = page; |
| 491 | desc->ptr = kmap(page); /* matching kunmap in nfs_do_filldir */ | 489 | desc->ptr = kmap(page); /* matching kunmap in nfs_do_filldir */ |
| 492 | if (desc->error >= 0) { | 490 | if (status >= 0) { |
| 493 | desc->timestamp = timestamp; | 491 | desc->timestamp = timestamp; |
| 494 | desc->timestamp_valid = 1; | 492 | desc->timestamp_valid = 1; |
| 495 | if ((status = dir_decode(desc)) == 0) | 493 | if ((status = dir_decode(desc)) == 0) |
