1 files changed, 80 insertions, 36 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index a1554bead692..a23f34894167 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -34,6 +34,7 @@
 
 #include "nfs4_fs.h"
 #include "delegation.h"
+#include "iostat.h"
 
 #define NFS_PARANOIA 1
 /* #define NFS_DEBUG_VERBOSE 1 */
@@ -53,7 +54,7 @@ static int nfs_rename(struct inode *, struct dentry *,
 static int nfs_fsync_dir(struct file *, struct dentry *, int);
 static loff_t nfs_llseek_dir(struct file *, loff_t, int);
 
-struct file_operations nfs_dir_operations = {
+const struct file_operations nfs_dir_operations = {
         .llseek         = nfs_llseek_dir,
         .read           = generic_read_dir,
         .readdir        = nfs_readdir,
@@ -129,6 +130,9 @@ nfs_opendir(struct inode *inode, struct file *filp)
 {
         int res = 0;
 
+        dfprintk(VFS, "NFS: opendir(%s/%ld)\n",
+                        inode->i_sb->s_id, inode->i_ino);
+
         lock_kernel();
         /* Call generic open code in order to cache credentials */
         if (!res)
@@ -172,7 +176,9 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
         unsigned long   timestamp;
         int             error;
 
-        dfprintk(VFS, "NFS: nfs_readdir_filler() reading cookie %Lu into page %lu.\n", (long long)desc->entry->cookie, page->index);
+        dfprintk(DIRCACHE, "NFS: %s: reading cookie %Lu into page %lu\n",
+                        __FUNCTION__, (long long)desc->entry->cookie,
+                        page->index);
 
  again:
         timestamp = jiffies;
@@ -244,7 +250,8 @@ int find_dirent(nfs_readdir_descriptor_t *desc)
                         status;
 
         while((status = dir_decode(desc)) == 0) {
-                dfprintk(VFS, "NFS: found cookie %Lu\n", (unsigned long long)entry->cookie);
+                dfprintk(DIRCACHE, "NFS: %s: examining cookie %Lu\n",
+                                __FUNCTION__, (unsigned long long)entry->cookie);
                 if (entry->prev_cookie == *desc->dir_cookie)
                         break;
                 if (loop_count++ > 200) {
@@ -252,7 +259,6 @@ int find_dirent(nfs_readdir_descriptor_t *desc)
                         schedule();
                 }
         }
-        dfprintk(VFS, "NFS: find_dirent() returns %d\n", status);
         return status;
 }
 
@@ -276,7 +282,8 @@ int find_dirent_index(nfs_readdir_descriptor_t *desc)
                 if (status)
                         break;
 
-                dfprintk(VFS, "NFS: found cookie %Lu at index %Ld\n", (unsigned long long)entry->cookie, desc->current_index);
+                dfprintk(DIRCACHE, "NFS: found cookie %Lu at index %Ld\n",
+                                (unsigned long long)entry->cookie, desc->current_index);
 
                 if (desc->file->f_pos == desc->current_index) {
                         *desc->dir_cookie = entry->cookie;
@@ -288,7 +295,6 @@ int find_dirent_index(nfs_readdir_descriptor_t *desc)
                         schedule();
                 }
         }
-        dfprintk(VFS, "NFS: find_dirent_index() returns %d\n", status);
         return status;
 }
 
@@ -303,7 +309,9 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc)
         struct page     *page;
         int             status;
 
-        dfprintk(VFS, "NFS: find_dirent_page() searching directory page %ld\n", desc->page_index);
+        dfprintk(DIRCACHE, "NFS: %s: searching page %ld for target %Lu\n",
+                        __FUNCTION__, desc->page_index,
+                        (long long) *desc->dir_cookie);
 
         page = read_cache_page(inode->i_mapping, desc->page_index,
                                (filler_t *)nfs_readdir_filler, desc);
@@ -324,7 +332,7 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc)
         if (status < 0)
                 dir_page_release(desc);
  out:
-        dfprintk(VFS, "NFS: find_dirent_page() returns %d\n", status);
+        dfprintk(DIRCACHE, "NFS: %s: returns %d\n", __FUNCTION__, status);
         return status;
  read_error:
         page_cache_release(page);
@@ -346,13 +354,15 @@ int readdir_search_pagecache(nfs_readdir_descriptor_t *desc)
 
         /* Always search-by-index from the beginning of the cache */
         if (*desc->dir_cookie == 0) {
-                dfprintk(VFS, "NFS: readdir_search_pagecache() searching for offset %Ld\n", (long long)desc->file->f_pos);
+                dfprintk(DIRCACHE, "NFS: readdir_search_pagecache() searching for offset %Ld\n",
+                                (long long)desc->file->f_pos);
                 desc->page_index = 0;
                 desc->entry->cookie = desc->entry->prev_cookie = 0;
                 desc->entry->eof = 0;
                 desc->current_index = 0;
         } else
-                dfprintk(VFS, "NFS: readdir_search_pagecache() searching for cookie %Lu\n", (unsigned long long)*desc->dir_cookie);
+                dfprintk(DIRCACHE, "NFS: readdir_search_pagecache() searching for cookie %Lu\n",
+                                (unsigned long long)*desc->dir_cookie);
 
         for (;;) {
                 res = find_dirent_page(desc);
@@ -365,7 +375,8 @@ int readdir_search_pagecache(nfs_readdir_descriptor_t *desc)
                         schedule();
                 }
         }
-        dfprintk(VFS, "NFS: readdir_search_pagecache() returned %d\n", res);
+
+        dfprintk(DIRCACHE, "NFS: %s: returns %d\n", __FUNCTION__, res);
         return res;
 }
 
@@ -390,7 +401,8 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc, void *dirent,
         int             loop_count = 0,
                         res;
 
-        dfprintk(VFS, "NFS: nfs_do_filldir() filling starting @ cookie %Lu\n", (long long)entry->cookie);
+        dfprintk(DIRCACHE, "NFS: nfs_do_filldir() filling starting @ cookie %Lu\n",
+                        (unsigned long long)entry->cookie);
 
         for(;;) {
                 unsigned d_type = DT_UNKNOWN;
@@ -427,7 +439,8 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc, void *dirent,
         dir_page_release(desc);
         if (dentry != NULL)
                 dput(dentry);
-        dfprintk(VFS, "NFS: nfs_do_filldir() filling ended @ cookie %Lu; returning = %d\n", (unsigned long long)*desc->dir_cookie, res);
+        dfprintk(DIRCACHE, "NFS: nfs_do_filldir() filling ended @ cookie %Lu; returning = %d\n",
+                        (unsigned long long)*desc->dir_cookie, res);
         return res;
 }
 
@@ -453,7 +466,8 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
         struct page     *page = NULL;
         int             status;
 
-        dfprintk(VFS, "NFS: uncached_readdir() searching for cookie %Lu\n", (unsigned long long)*desc->dir_cookie);
+        dfprintk(DIRCACHE, "NFS: uncached_readdir() searching for cookie %Lu\n",
+                        (unsigned long long)*desc->dir_cookie);
 
         page = alloc_page(GFP_HIGHUSER);
         if (!page) {
@@ -485,7 +499,8 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
         desc->entry->cookie = desc->entry->prev_cookie = 0;
         desc->entry->eof = 0;
  out:
-        dfprintk(VFS, "NFS: uncached_readdir() returns %d\n", status);
+        dfprintk(DIRCACHE, "NFS: %s: returns %d\n",
+                        __FUNCTION__, status);
         return status;
  out_release:
         dir_page_release(desc);
@@ -507,6 +522,11 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
         struct nfs_fattr fattr;
         long            res;
 
+        dfprintk(VFS, "NFS: readdir(%s/%s) starting at cookie %Lu\n",
+                        dentry->d_parent->d_name.name, dentry->d_name.name,
+                        (long long)filp->f_pos);
+        nfs_inc_stats(inode, NFSIOS_VFSGETDENTS);
+
         lock_kernel();
 
         res = nfs_revalidate_inode(NFS_SERVER(inode), inode);
@@ -566,9 +586,12 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 }
         }
         unlock_kernel();
-        if (res < 0)
-                return res;
-        return 0;
+        if (res > 0)
+                res = 0;
+        dfprintk(VFS, "NFS: readdir(%s/%s) returns %ld\n",
+                        dentry->d_parent->d_name.name, dentry->d_name.name,
+                        res);
+        return res;
 }
 
 loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)
@@ -599,6 +622,10 @@ out:
  */
 int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync)
 {
+        dfprintk(VFS, "NFS: fsync_dir(%s/%s) datasync %d\n",
+                        dentry->d_parent->d_name.name, dentry->d_name.name,
+                        datasync);
+
         return 0;
 }
 
@@ -713,6 +740,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
         parent = dget_parent(dentry);
         lock_kernel();
         dir = parent->d_inode;
+        nfs_inc_stats(dir, NFSIOS_DENTRYREVALIDATE);
         inode = dentry->d_inode;
 
         if (!inode) {
@@ -722,8 +750,9 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
         }
 
         if (is_bad_inode(inode)) {
-                dfprintk(VFS, "nfs_lookup_validate: %s/%s has dud inode\n",
-                        dentry->d_parent->d_name.name, dentry->d_name.name);
+                dfprintk(LOOKUPCACHE, "%s: %s/%s has dud inode\n",
+                                __FUNCTION__, dentry->d_parent->d_name.name,
+                                dentry->d_name.name);
                 goto out_bad;
         }
 
@@ -755,6 +784,9 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
  out_valid:
         unlock_kernel();
         dput(parent);
+        dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) is valid\n",
+                        __FUNCTION__, dentry->d_parent->d_name.name,
+                        dentry->d_name.name);
         return 1;
 out_zap_parent:
         nfs_zap_caches(dir);
@@ -771,6 +803,9 @@ out_zap_parent:
         d_drop(dentry);
         unlock_kernel();
         dput(parent);
+        dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) is invalid\n",
+                        __FUNCTION__, dentry->d_parent->d_name.name,
+                        dentry->d_name.name);
         return 0;
 }
 
@@ -844,6 +879,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
 
         dfprintk(VFS, "NFS: lookup(%s/%s)\n",
                 dentry->d_parent->d_name.name, dentry->d_name.name);
+        nfs_inc_stats(dir, NFSIOS_VFSLOOKUP);
 
         res = ERR_PTR(-ENAMETOOLONG);
         if (dentry->d_name.len > NFS_SERVER(dir)->namelen)
@@ -865,9 +901,9 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
                 res = ERR_PTR(error);
                 goto out_unlock;
         }
-        res = ERR_PTR(-EACCES);
         inode = nfs_fhget(dentry->d_sb, &fhandle, &fattr);
-        if (!inode)
+        res = (struct dentry *)inode;
+        if (IS_ERR(res))
                 goto out_unlock;
 no_entry:
         res = d_add_unique(dentry, inode);
@@ -912,6 +948,9 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
         struct dentry *res = NULL;
         int error;
 
+        dfprintk(VFS, "NFS: atomic_lookup(%s/%ld), %s\n",
+                        dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
+
         /* Check that we are indeed trying to open this file */
         if (!is_atomic_open(dir, nd))
                 goto no_open;
@@ -1057,7 +1096,7 @@ static struct dentry *nfs_readdir_lookup(nfs_readdir_descriptor_t *desc)
                 return NULL;
         dentry->d_op = NFS_PROTO(dir)->dentry_ops;
         inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr);
-        if (!inode) {
+        if (IS_ERR(inode)) {
                 dput(dentry);
                 return NULL;
         }
@@ -1095,9 +1134,9 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle,
                 if (error < 0)
                         goto out_err;
         }
-        error = -ENOMEM;
         inode = nfs_fhget(dentry->d_sb, fhandle, fattr);
-        if (inode == NULL)
+        error = PTR_ERR(inode);
+        if (IS_ERR(inode))
                 goto out_err;
         d_instantiate(dentry, inode);
         return 0;
@@ -1119,8 +1158,8 @@ static int nfs_create(struct inode *dir, struct dentry *dentry, int mode,
         int error;
         int open_flags = 0;
 
-        dfprintk(VFS, "NFS: create(%s/%ld, %s\n", dir->i_sb->s_id, 
-                dir->i_ino, dentry->d_name.name);
+        dfprintk(VFS, "NFS: create(%s/%ld), %s\n",
+                        dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
 
         attr.ia_mode = mode;
         attr.ia_valid = ATTR_MODE;
@@ -1153,8 +1192,8 @@ nfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
         struct iattr attr;
         int status;
 
-        dfprintk(VFS, "NFS: mknod(%s/%ld, %s\n", dir->i_sb->s_id,
-                dir->i_ino, dentry->d_name.name);
+        dfprintk(VFS, "NFS: mknod(%s/%ld), %s\n",
+                        dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
 
         if (!new_valid_dev(rdev))
                 return -EINVAL;
@@ -1186,8 +1225,8 @@ static int nfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         struct iattr attr;
         int error;
 
-        dfprintk(VFS, "NFS: mkdir(%s/%ld, %s\n", dir->i_sb->s_id,
-                dir->i_ino, dentry->d_name.name);
+        dfprintk(VFS, "NFS: mkdir(%s/%ld), %s\n",
+                        dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
 
         attr.ia_valid = ATTR_MODE;
         attr.ia_mode = mode | S_IFDIR;
@@ -1212,8 +1251,8 @@ static int nfs_rmdir(struct inode *dir, struct dentry *dentry)
 {
         int error;
 
-        dfprintk(VFS, "NFS: rmdir(%s/%ld, %s\n", dir->i_sb->s_id,
-                dir->i_ino, dentry->d_name.name);
+        dfprintk(VFS, "NFS: rmdir(%s/%ld), %s\n",
+                        dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
 
         lock_kernel();
         nfs_begin_data_update(dir);
@@ -1241,6 +1280,7 @@ static int nfs_sillyrename(struct inode *dir, struct dentry *dentry)
         dfprintk(VFS, "NFS: silly-rename(%s/%s, ct=%d)\n",
                 dentry->d_parent->d_name.name, dentry->d_name.name, 
                 atomic_read(&dentry->d_count));
+        nfs_inc_stats(dir, NFSIOS_SILLYRENAME);
 
 #ifdef NFS_PARANOIA
 if (!dentry->d_inode)
@@ -1268,8 +1308,8 @@ dentry->d_parent->d_name.name, dentry->d_name.name);
                 sillycounter++;
                 sprintf(suffix, "%*.*x", countersize, countersize, sillycounter);
 
-                dfprintk(VFS, "trying to rename %s to %s\n",
-                         dentry->d_name.name, silly);
+                dfprintk(VFS, "NFS: trying to rename %s to %s\n",
+                                dentry->d_name.name, silly);
                 
                 sdentry = lookup_one_len(silly, dentry->d_parent, slen);
                 /*
@@ -1640,6 +1680,8 @@ int nfs_permission(struct inode *inode, int mask, struct nameidata *nd)
         struct rpc_cred *cred;
         int res = 0;
 
+        nfs_inc_stats(inode, NFSIOS_VFSACCESS);
+
         if (mask == 0)
                 goto out;
         /* Is this sys_access() ? */
@@ -1679,13 +1721,15 @@ force_lookup:
                 res = PTR_ERR(cred);
         unlock_kernel();
 out:
+        dfprintk(VFS, "NFS: permission(%s/%ld), mask=0x%x, res=%d\n",
+                inode->i_sb->s_id, inode->i_ino, mask, res);
         return res;
 out_notsup:
         res = nfs_revalidate_inode(NFS_SERVER(inode), inode);
         if (res == 0)
                 res = generic_permission(inode, mask, NULL);
         unlock_kernel();
-        return res;
+        goto out;
 }
 
 /*