3 files changed, 27 insertions, 11 deletions

diff --git a/fs/coda/Kconfig b/fs/coda/Kconfig
new file mode 100644
index 000000000000..c0e5a7fad06d
--- /dev/null
+++ b/fs/coda/Kconfig
@@ -0,0 +1,21 @@
+config CODA_FS
+        tristate "Coda file system support (advanced network fs)"
+        depends on INET
+        help
+          Coda is an advanced network file system, similar to NFS in that it
+          enables you to mount file systems of a remote server and access them
+          with regular Unix commands as if they were sitting on your hard
+          disk.  Coda has several advantages over NFS: support for
+          disconnected operation (e.g. for laptops), read/write server
+          replication, security model for authentication and encryption,
+          persistent client caches and write back caching.
+
+          If you say Y here, your Linux box will be able to act as a Coda
+          *client*.  You will need user level code as well, both for the
+          client and server.  Servers are currently user level, i.e. they need
+          no kernel support.  Please read
+          <file:Documentation/filesystems/coda.txt> and check out the Coda
+          home page <http://www.coda.cs.cmu.edu/>.
+
+          To compile the coda client support as a module, choose M here: the
+          module will be called coda.
diff --git a/fs/coda/file.c b/fs/coda/file.c
index 466303db2df6..6a347fbc998a 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -201,8 +201,7 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
 int coda_fsync(struct file *coda_file, struct dentry *coda_dentry, int datasync)
 {
         struct file *host_file;
-        struct dentry *host_dentry;
-        struct inode *host_inode, *coda_inode = coda_dentry->d_inode;
+        struct inode *coda_inode = coda_dentry->d_inode;
         struct coda_file_info *cfi;
         int err = 0;
 
@@ -214,14 +213,7 @@ int coda_fsync(struct file *coda_file, struct dentry *coda_dentry, int datasync)
         BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
         host_file = cfi->cfi_container;
 
-        if (host_file->f_op && host_file->f_op->fsync) {
-                host_dentry = host_file->f_path.dentry;
-                host_inode = host_dentry->d_inode;
-                mutex_lock(&host_inode->i_mutex);
-                err = host_file->f_op->fsync(host_file, host_dentry, datasync);
-                mutex_unlock(&host_inode->i_mutex);
-        }
-
+        err = vfs_fsync(host_file, host_file->f_path.dentry, datasync);
         if ( !err && !datasync ) {
                 lock_kernel();
                 err = venus_fsync(coda_inode->i_sb, coda_i2f(coda_inode));
diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c
index 81b7771c6465..43c96ce29614 100644
--- a/fs/coda/sysctl.c
+++ b/fs/coda/sysctl.c
@@ -11,7 +11,9 @@
 
 #include "coda_int.h"
 
+#ifdef CONFIG_SYSCTL
 static struct ctl_table_header *fs_table_header;
+#endif
 
 static ctl_table coda_table[] = {
         {
@@ -41,6 +43,7 @@ static ctl_table coda_table[] = {
         {}
 };
 
+#ifdef CONFIG_SYSCTL
 static ctl_table fs_table[] = {
         {
                 .ctl_name       = CTL_UNNUMBERED,
@@ -50,7 +53,7 @@ static ctl_table fs_table[] = {
         },
         {}
 };
-
+#endif
 
 void coda_sysctl_init(void)
 {