Merge branch 'osd-devel' into nfs-for-next

[pandora-kernel.git] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index bd7dff0..0a1f831 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -178,8 +178,6 @@ force_reval:
 
 static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
 {
-       loff_t loff;
-
        dprintk("NFS: llseek file(%s/%s, %lld, %d)\n",
                        filp->f_path.dentry->d_parent->d_name.name,
                        filp->f_path.dentry->d_name.name,
@@ -195,13 +193,9 @@ static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
                int retval = nfs_revalidate_file_size(inode, filp);
                if (retval < 0)
                        return (loff_t)retval;
+       }
 
-               spin_lock(&inode->i_lock);
-               loff = generic_file_llseek_unlocked(filp, offset, origin);
-               spin_unlock(&inode->i_lock);
-       } else
-               loff = generic_file_llseek_unlocked(filp, offset, origin);
-       return loff;
+       return generic_file_llseek(filp, offset, origin);
 }
 
 /*