diff options
| -rw-r--r-- | fs/nfs/file.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 12623abcf3d4..91c01f0a4c3b 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
| @@ -180,8 +180,6 @@ force_reval: | |||
| 180 | 180 | ||
| 181 | static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin) | 181 | static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin) |
| 182 | { | 182 | { |
| 183 | loff_t loff; | ||
| 184 | |||
| 185 | dprintk("NFS: llseek file(%s/%s, %lld, %d)\n", | 183 | dprintk("NFS: llseek file(%s/%s, %lld, %d)\n", |
| 186 | filp->f_path.dentry->d_parent->d_name.name, | 184 | filp->f_path.dentry->d_parent->d_name.name, |
| 187 | filp->f_path.dentry->d_name.name, | 185 | filp->f_path.dentry->d_name.name, |
| @@ -197,14 +195,9 @@ static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin) | |||
| 197 | int retval = nfs_revalidate_file_size(inode, filp); | 195 | int retval = nfs_revalidate_file_size(inode, filp); |
| 198 | if (retval < 0) | 196 | if (retval < 0) |
| 199 | return (loff_t)retval; | 197 | return (loff_t)retval; |
| 198 | } | ||
| 200 | 199 | ||
| 201 | /* AK: should drop this lock. Unlikely to be needed. */ | 200 | return generic_file_llseek(filp, offset, origin); |
| 202 | spin_lock(&inode->i_lock); | ||
| 203 | loff = generic_file_llseek(filp, offset, origin); | ||
| 204 | spin_unlock(&inode->i_lock); | ||
| 205 | } else | ||
| 206 | loff = generic_file_llseek(filp, offset, origin); | ||
| 207 | return loff; | ||
| 208 | } | 201 | } |
| 209 | 202 | ||
| 210 | /* | 203 | /* |
