4 files changed, 13 insertions, 30 deletions

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index a804903d31d1..33408417038c 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -296,6 +296,7 @@ const struct file_operations reiserfs_file_operations = {
         .aio_write = generic_file_aio_write,
         .splice_read = generic_file_splice_read,
         .splice_write = generic_file_splice_write,
+        .llseek = generic_file_llseek,
 };
 
 const struct inode_operations reiserfs_file_inode_operations = {
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 5699171212ae..6c4c2c69449f 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1522,7 +1522,6 @@ static struct dentry *reiserfs_get_dentry(struct super_block *sb,
 
 {
         struct cpu_key key;
-        struct dentry *result;
         struct inode *inode;
 
         key.on_disk_key.k_objectid = objectid;
@@ -1535,16 +1534,8 @@ static struct dentry *reiserfs_get_dentry(struct super_block *sb,
                 inode = NULL;
         }
         reiserfs_write_unlock(sb);
-        if (!inode)
-                inode = ERR_PTR(-ESTALE);
-        if (IS_ERR(inode))
-                return ERR_CAST(inode);
-        result = d_alloc_anon(inode);
-        if (!result) {
-                iput(inode);
-                return ERR_PTR(-ENOMEM);
-        }
-        return result;
+
+        return d_obtain_alias(inode);
 }
 
 struct dentry *reiserfs_fh_to_dentry(struct super_block *sb, struct fid *fid,
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index c1add28dd45e..f89ebb943f3f 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -383,7 +383,6 @@ struct dentry *reiserfs_get_parent(struct dentry *child)
         struct inode *inode = NULL;
         struct reiserfs_dir_entry de;
         INITIALIZE_PATH(path_to_entry);
-        struct dentry *parent;
         struct inode *dir = child->d_inode;
 
         if (dir->i_nlink == 0) {
@@ -401,15 +400,7 @@ struct dentry *reiserfs_get_parent(struct dentry *child)
         inode = reiserfs_iget(dir->i_sb, (struct cpu_key *)&(de.de_dir_id));
         reiserfs_write_unlock(dir->i_sb);
 
-        if (!inode || IS_ERR(inode)) {
-                return ERR_PTR(-EACCES);
-        }
-        parent = d_alloc_anon(inode);
-        if (!parent) {
-                iput(inode);
-                parent = ERR_PTR(-ENOMEM);
-        }
-        return parent;
+        return d_obtain_alias(inode);
 }
 
 /* add entry to the directory (entry can be hidden). 
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index d318c7e663fa..663a91f5dce8 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -2058,10 +2058,10 @@ static int reiserfs_quota_on_mount(struct super_block *sb, int type)
  * Standard function to be called on quota_on
  */
 static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
-                             char *path, int remount)
+                             char *name, int remount)
 {
         int err;
-        struct nameidata nd;
+        struct path path;
         struct inode *inode;
         struct reiserfs_transaction_handle th;
 
@@ -2069,16 +2069,16 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
                 return -EINVAL;
         /* No more checks needed? Path and format_id are bogus anyway... */
         if (remount)
-                return vfs_quota_on(sb, type, format_id, path, 1);
-        err = path_lookup(path, LOOKUP_FOLLOW, &nd);
+                return vfs_quota_on(sb, type, format_id, name, 1);
+        err = kern_path(name, LOOKUP_FOLLOW, &path);
         if (err)
                 return err;
         /* Quotafile not on the same filesystem? */
-        if (nd.path.mnt->mnt_sb != sb) {
+        if (path.mnt->mnt_sb != sb) {
                 err = -EXDEV;
                 goto out;
         }
-        inode = nd.path.dentry->d_inode;
+        inode = path.dentry->d_inode;
         /* We must not pack tails for quota files on reiserfs for quota IO to work */
         if (!(REISERFS_I(inode)->i_flags & i_nopack_mask)) {
                 err = reiserfs_unpack(inode, NULL);
@@ -2094,7 +2094,7 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
         /* Journaling quota? */
         if (REISERFS_SB(sb)->s_qf_names[type]) {
                 /* Quotafile not of fs root? */
-                if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)
+                if (path.dentry->d_parent != sb->s_root)
                         reiserfs_warning(sb,
                                  "reiserfs: Quota file not on filesystem root. "
                                  "Journalled quota will not work.");
@@ -2113,9 +2113,9 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
                 if (err)
                         goto out;
         }
-        err = vfs_quota_on_path(sb, type, format_id, &nd.path);
+        err = vfs_quota_on_path(sb, type, format_id, &path);
 out:
-        path_put(&nd.path);
+        path_put(&path);
         return err;
 }