REPOST patch 04/38: CLIENT: change CONFIG_NFS_V3 to CONFIG_NFS_V3 || CONFIG_NFS_V4

REPOST patch 04/38: CLIENT: change CONFIG_NFS_V3 to CONFIG_NFS_V3 || CONFIG_NFS_V4

Post by Kendrick M. Smit » Fri, 16 Aug 2002 05:50:06



In a number of places in the NFS client, I had to change

  #ifdef CONFIG_NFS_V3
     /* ... */
  #endif

to

  #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
     /* ... */
  #endif

This is a trivial patch which collects all changes of this type.

--- old/fs/nfs/flushd.c Thu Aug  1 16:16:29 2002

                        nfs_pagein_list(&head, server->rpages);
                        continue;
                }
-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
                if (nfs_scan_lru_commit_timeout(server, &head)) {
                        spin_unlock(&nfs_wreq_lock);
                        nfs_commit_list(&head, FLUSH_AGING);
--- old/fs/nfs/pagelist.c       Sun Aug 11 19:20:53 2002

                        continue;
                }

-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
                /* Let's try to free up some completed NFSv3 unstable writes */
                nfs_scan_lru_commit(server, &head);
                if (!list_empty(&head)) {
--- old/fs/nfs/write.c  Thu Aug  1 16:16:12 2002

                                            unsigned int, unsigned int);
 static void    nfs_strategy(struct inode *inode);
 static void    nfs_writeback_done(struct rpc_task *);
-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 static void    nfs_commit_done(struct rpc_task *);
 #endif

        return !list_empty(&req->wb_list) && req->wb_list_head == &nfsi->dirty;
 }

-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 /*
  * Add a request to the inode's commit list.

        return res;
 }

-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 /**
  * nfs_scan_lru_commit_timeout - Scan LRU list for timed out commit requests

        dirty  = NFS_I(inode)->ndirty;
        wpages = NFS_SERVER(inode)->wpages;
-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
        if (NFS_PROTO(inode)->version == 2) {
                if (dirty >= NFS_STRATEGY_PAGES * wpages)

                 * an error. */
                task->tk_status = -EIO;
        }
-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
        if (resp->verf->committed < argp->stable && task->tk_status >= 0) {
                /* We tried a write call, but the server did not

                        goto next;
                }

-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
                if (argp->stable != NFS_UNSTABLE || resp->verf->committed == NFS_FILE_SYNC) {
                        nfs_inode_remove_request(req);

 }

-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 /*
  * Set up the argument/result storage required for the RPC call.

        return res;
 }

-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 int nfs_commit_file(struct inode *inode, struct file *file, unsigned long idx_start,
                    unsigned int npages, int how)

                        error = nfs_wait_on_requests(inode, file, idx_start, npages);
                if (error == 0)
                        error = nfs_flush_file(inode, file, idx_start, npages, how);
-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
                if (error == 0)
                        error = nfs_commit_file(inode, file, idx_start, npages, how);
 #endif
--- old/include/linux/nfs_fs.h  Sun Aug 11 19:20:53 2002

 extern int  nfs_flush_list(struct list_head *, int, int);
 extern int  nfs_scan_lru_dirty(struct nfs_server *, struct list_head *);
 extern int  nfs_scan_lru_dirty_timeout(struct nfs_server *, struct list_head *);
-#ifdef CONFIG_NFS_V3
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 extern int  nfs_commit_file(struct inode *, struct file *, unsigned long, unsigned int, int);
 extern int  nfs_commit_list(struct list_head *, int);
 extern int  nfs_scan_lru_commit(struct nfs_server *, struct list_head *);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/