[PATCH] tightening hugetlb strict accounting

[linux-2.6] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 6bcbc4d676c485b1fde50f48df52c18f00b65ce5..fade02c15e6ef11a8575e6381b6f10445a1de375 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -49,7 +49,7 @@ static int nfs_check_flags(int flags);
 static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl);
 static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl);
 
-struct file_operations nfs_file_operations = {
+const struct file_operations nfs_file_operations = {
        .llseek         = nfs_file_llseek,
        .read           = do_sync_read,
        .write          = do_sync_write,
@@ -318,10 +318,9 @@ static int nfs_commit_write(struct file *file, struct page *page, unsigned offse
        return status;
 }
 
-static int nfs_invalidate_page(struct page *page, unsigned long offset)
+static void nfs_invalidate_page(struct page *page, unsigned long offset)
 {
        /* FIXME: we really should cancel any unstarted writes on this page */
-       return 1;
 }
 
 static int nfs_release_page(struct page *page, gfp_t gfp)
@@ -443,10 +442,8 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl)
 static int do_unlk(struct file *filp, int cmd, struct file_lock *fl)
 {
        struct inode *inode = filp->f_mapping->host;
-       sigset_t oldset;
        int status;
 
-       rpc_clnt_sigmask(NFS_CLIENT(inode), &oldset);
        /*
         * Flush all pending writes before doing anything
         * with locks..
@@ -464,17 +461,14 @@ static int do_unlk(struct file *filp, int cmd, struct file_lock *fl)
        else
                status = do_vfs_lock(filp, fl);
        unlock_kernel();
-       rpc_clnt_sigunmask(NFS_CLIENT(inode), &oldset);
        return status;
 }
 
 static int do_setlk(struct file *filp, int cmd, struct file_lock *fl)
 {
        struct inode *inode = filp->f_mapping->host;
-       sigset_t oldset;
        int status;
 
-       rpc_clnt_sigmask(NFS_CLIENT(inode), &oldset);
        /*
         * Flush all pending writes before doing anything
         * with locks..
@@ -507,7 +501,6 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl)
        nfs_sync_mapping(filp->f_mapping);
        nfs_zap_caches(inode);
 out:
-       rpc_clnt_sigunmask(NFS_CLIENT(inode), &oldset);
        return status;
 }
 
@@ -541,10 +534,9 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
  */
 static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
 {
-       struct inode * inode = filp->f_mapping->host;
-
        dprintk("NFS: nfs_flock(f=%s/%ld, t=%x, fl=%x)\n",
-                       inode->i_sb->s_id, inode->i_ino,
+                       filp->f_dentry->d_inode->i_sb->s_id,
+                       filp->f_dentry->d_inode->i_ino,
                        fl->fl_type, fl->fl_flags);
 
        /*