4 files changed, 8 insertions, 163 deletions

diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
index 24fd598af846..7f7abec25e14 100644
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
@@ -148,7 +148,6 @@ xfs_fs_fh_to_dentry(struct super_block *sb, struct fid *fid,
 {
         struct xfs_fid64        *fid64 = (struct xfs_fid64 *)fid;
         struct inode            *inode = NULL;
-        struct dentry           *result;
 
         if (fh_len < xfs_fileid_length(fileid_type))
                 return NULL;
@@ -164,16 +163,7 @@ xfs_fs_fh_to_dentry(struct super_block *sb, struct fid *fid,
                 break;
         }
 
-        if (!inode)
-                return NULL;
-        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);
 }
 
 STATIC struct dentry *
@@ -182,7 +172,6 @@ xfs_fs_fh_to_parent(struct super_block *sb, struct fid *fid,
 {
         struct xfs_fid64        *fid64 = (struct xfs_fid64 *)fid;
         struct inode            *inode = NULL;
-        struct dentry           *result;
 
         switch (fileid_type) {
         case FILEID_INO32_GEN_PARENT:
@@ -195,16 +184,7 @@ xfs_fs_fh_to_parent(struct super_block *sb, struct fid *fid,
                 break;
         }
 
-        if (!inode)
-                return NULL;
-        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);
 }
 
 STATIC struct dentry *
@@ -213,18 +193,12 @@ xfs_fs_get_parent(
 {
         int                     error;
         struct xfs_inode        *cip;
-        struct dentry           *parent;
 
         error = xfs_lookup(XFS_I(child->d_inode), &xfs_name_dotdot, &cip, NULL);
         if (unlikely(error))
                 return ERR_PTR(-error);
 
-        parent = d_alloc_anon(VFS_I(cip));
-        if (unlikely(!parent)) {
-                iput(VFS_I(cip));
-                return ERR_PTR(-ENOMEM);
-        }
-        return parent;
+        return d_obtain_alias(VFS_I(cip));
 }
 
 const struct export_operations xfs_export_operations = {
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index 5311c1acdd40..3fee790f138b 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -204,15 +204,6 @@ xfs_file_fsync(
         return -xfs_fsync(XFS_I(dentry->d_inode));
 }
 
-/*
- * Unfortunately we can't just use the clean and simple readdir implementation
- * below, because nfs might call back into ->lookup from the filldir callback
- * and that will deadlock the low-level btree code.
- *
- * Hopefully we'll find a better workaround that allows to use the optimal
- * version at least for local readdirs for 2.6.25.
- */
-#if 0
 STATIC int
 xfs_file_readdir(
         struct file     *filp,
@@ -244,125 +235,6 @@ xfs_file_readdir(
                 return -error;
         return 0;
 }
-#else
-
-struct hack_dirent {
-        u64             ino;
-        loff_t          offset;
-        int             namlen;
-        unsigned int    d_type;
-        char            name[];
-};
-
-struct hack_callback {
-        char            *dirent;
-        size_t          len;
-        size_t          used;
-};
-
-STATIC int
-xfs_hack_filldir(
-        void            *__buf,
-        const char      *name,
-        int             namlen,
-        loff_t          offset,
-        u64             ino,
-        unsigned int    d_type)
-{
-        struct hack_callback *buf = __buf;
-        struct hack_dirent *de = (struct hack_dirent *)(buf->dirent + buf->used);
-        unsigned int reclen;
-
-        reclen = ALIGN(sizeof(struct hack_dirent) + namlen, sizeof(u64));
-        if (buf->used + reclen > buf->len)
-                return -EINVAL;
-
-        de->namlen = namlen;
-        de->offset = offset;
-        de->ino = ino;
-        de->d_type = d_type;
-        memcpy(de->name, name, namlen);
-        buf->used += reclen;
-        return 0;
-}
-
-STATIC int
-xfs_file_readdir(
-        struct file     *filp,
-        void            *dirent,
-        filldir_t       filldir)
-{
-        struct inode    *inode = filp->f_path.dentry->d_inode;
-        xfs_inode_t     *ip = XFS_I(inode);
-        struct hack_callback buf;
-        struct hack_dirent *de;
-        int             error;
-        loff_t          size;
-        int             eof = 0;
-        xfs_off_t       start_offset, curr_offset, offset;
-
-        /*
-         * Try fairly hard to get memory
-         */
-        buf.len = PAGE_CACHE_SIZE;
-        do {
-                buf.dirent = kmalloc(buf.len, GFP_KERNEL);
-                if (buf.dirent)
-                        break;
-                buf.len >>= 1;
-        } while (buf.len >= 1024);
-
-        if (!buf.dirent)
-                return -ENOMEM;
-
-        curr_offset = filp->f_pos;
-        if (curr_offset == 0x7fffffff)
-                offset = 0xffffffff;
-        else
-                offset = filp->f_pos;
-
-        while (!eof) {
-                unsigned int reclen;
-
-                start_offset = offset;
-
-                buf.used = 0;
-                error = -xfs_readdir(ip, &buf, buf.len, &offset,
-                                     xfs_hack_filldir);
-                if (error || offset == start_offset) {
-                        size = 0;
-                        break;
-                }
-
-                size = buf.used;
-                de = (struct hack_dirent *)buf.dirent;
-                while (size > 0) {
-                        curr_offset = de->offset /* & 0x7fffffff */;
-                        if (filldir(dirent, de->name, de->namlen,
-                                        curr_offset & 0x7fffffff,
-                                        de->ino, de->d_type)) {
-                                goto done;
-                        }
-
-                        reclen = ALIGN(sizeof(struct hack_dirent) + de->namlen,
-                                       sizeof(u64));
-                        size -= reclen;
-                        de = (struct hack_dirent *)((char *)de + reclen);
-                }
-        }
-
- done:
-        if (!error) {
-                if (size == 0)
-                        filp->f_pos = offset & 0x7fffffff;
-                else if (de)
-                        filp->f_pos = curr_offset;
-        }
-
-        kfree(buf.dirent);
-        return error;
-}
-#endif
 
 STATIC int
 xfs_file_mmap(
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index 48799ba7e3e6..d3438c72dcaf 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -311,11 +311,10 @@ xfs_open_by_handle(
                 return new_fd;
         }
 
-        dentry = d_alloc_anon(inode);
-        if (dentry == NULL) {
-                iput(inode);
+        dentry = d_obtain_alias(inode);
+        if (IS_ERR(dentry)) {
                 put_unused_fd(new_fd);
-                return -XFS_ERROR(ENOMEM);
+                return PTR_ERR(dentry);
         }
 
         /* Ensure umount returns EBUSY on umounts while this file is open. */
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index e39013619b26..37ebe36056eb 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -589,7 +589,7 @@ xfs_blkdev_get(
 {
         int                     error = 0;
 
-        *bdevp = open_bdev_excl(name, 0, mp);
+        *bdevp = open_bdev_exclusive(name, FMODE_READ|FMODE_WRITE, mp);
         if (IS_ERR(*bdevp)) {
                 error = PTR_ERR(*bdevp);
                 printk("XFS: Invalid device [%s], error=%d\n", name, error);
@@ -603,7 +603,7 @@ xfs_blkdev_put(
         struct block_device     *bdev)
 {
         if (bdev)
-                close_bdev_excl(bdev);
+                close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
 }
 
 /*