ufs: pass qstr instead of dentry where necessary for NFS

[safe/jmp/linux-2.6] / fs / ufs / dir.c

diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
index aaf2878..22af68f 100644 (file)
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -18,9 +18,9 @@
 
 #include <linux/time.h>
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/swap.h>
 
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "swab.h"
 #include "util.h"
@@ -70,13 +70,13 @@ static inline unsigned long ufs_dir_pages(struct inode *inode)
        return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;
 }
 
-ino_t ufs_inode_by_name(struct inode *dir, struct dentry *dentry)
+ino_t ufs_inode_by_name(struct inode *dir, struct qstr *qstr)
 {
        ino_t res = 0;
        struct ufs_dir_entry *de;
        struct page *page;
        
-       de = ufs_find_entry(dir, dentry, &page);
+       de = ufs_find_entry(dir, qstr, &page);
        if (de) {
                res = fs32_to_cpu(dir->i_sb, de->d_ino);
                ufs_put_page(page);
@@ -179,7 +179,7 @@ bad_entry:
        goto fail;
 Eend:
        p = (struct ufs_dir_entry *)(kaddr + offs);
-       ufs_error(sb, __FUNCTION__,
+       ufs_error(sb, __func__,
                   "entry in directory #%lu spans the page boundary"
                   "offset=%lu",
                   dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs);
@@ -249,12 +249,12 @@ struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p)
  * (as a parameter - res_dir). Page is returned mapped and unlocked.
  * Entry is guaranteed to be valid.
  */
-struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct dentry *dentry,
+struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct qstr *qstr,
                                     struct page **res_page)
 {
        struct super_block *sb = dir->i_sb;
-       const char *name = dentry->d_name.name;
-       int namelen = dentry->d_name.len;
+       const char *name = qstr->name;
+       int namelen = qstr->len;
        unsigned reclen = UFS_DIR_REC_LEN(namelen);
        unsigned long start, n;
        unsigned long npages = ufs_dir_pages(dir);
@@ -284,7 +284,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct dentry *dentry,
                        kaddr += ufs_last_byte(dir, n) - reclen;
                        while ((char *) de <= kaddr) {
                                if (de->d_reclen == 0) {
-                                       ufs_error(dir->i_sb, __FUNCTION__,
+                                       ufs_error(dir->i_sb, __func__,
                                                  "zero-length directory entry");
                                        ufs_put_page(page);
                                        goto out;
@@ -356,7 +356,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)
                                goto got_it;
                        }
                        if (de->d_reclen == 0) {
-                               ufs_error(dir->i_sb, __FUNCTION__,
+                               ufs_error(dir->i_sb, __func__,
                                          "zero-length directory entry");
                                err = -EIO;
                                goto out_unlock;
@@ -456,7 +456,7 @@ ufs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                struct page *page = ufs_get_page(inode, n);
 
                if (IS_ERR(page)) {
-                       ufs_error(sb, __FUNCTION__,
+                       ufs_error(sb, __func__,
                                  "bad page in #%lu",
                                  inode->i_ino);
                        filp->f_pos += PAGE_CACHE_SIZE - offset;
@@ -475,7 +475,7 @@ ufs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                limit = kaddr + ufs_last_byte(inode, n) - UFS_DIR_REC_LEN(1);
                for ( ;(char*)de <= limit; de = ufs_next_entry(sb, de)) {
                        if (de->d_reclen == 0) {
-                               ufs_error(sb, __FUNCTION__,
+                               ufs_error(sb, __func__,
                                        "zero-length directory entry");
                                ufs_put_page(page);
                                return -EIO;
@@ -536,7 +536,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir,
 
        while ((char*)de < (char*)dir) {
                if (de->d_reclen == 0) {
-                       ufs_error(inode->i_sb, __FUNCTION__,
+                       ufs_error(inode->i_sb, __func__,
                                  "zero-length directory entry");
                        err = -EIO;
                        goto out;
@@ -633,7 +633,7 @@ int ufs_empty_dir(struct inode * inode)
 
                while ((char *)de <= kaddr) {
                        if (de->d_reclen == 0) {
-                               ufs_error(inode->i_sb, __FUNCTION__,
+                               ufs_error(inode->i_sb, __func__,
                                        "zero-length directory entry: "
                                        "kaddr=%p, de=%p\n", kaddr, de);
                                goto not_empty;
@@ -666,5 +666,6 @@ not_empty:
 const struct file_operations ufs_dir_operations = {
        .read           = generic_read_dir,
        .readdir        = ufs_readdir,
-       .fsync          = file_fsync,
+       .fsync          = simple_fsync,
+       .llseek         = generic_file_llseek,
 };