From e3b7b089b43681e16a2a9209db60d113094c4aca Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 20 Mar 2006 13:44:48 -0500 Subject: [PATCH] --- yaml --- r: 23943 b: refs/heads/master c: a9a801787a761616589a6526d7a29c13f4deb3d8 h: refs/heads/master i: 23941: da2518f7c46033795ebc6b5e7848d682340fe6df 23939: 61ce1ad27b604a9d19f912b5ac3a5f92d3d0178a 23935: 219debd83b2ded8c4f3d158484c28c88ab093705 v: v3 --- [refs] | 2 +- trunk/fs/nfs/file.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6d193f794f51..e69c0622dded 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03f28e3a2059fc466761d872122f30acb7be61ae +refs/heads/master: a9a801787a761616589a6526d7a29c13f4deb3d8 diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c index 6bcbc4d676c4..5263b2864a44 100644 --- a/trunk/fs/nfs/file.c +++ b/trunk/fs/nfs/file.c @@ -443,10 +443,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 +462,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 +502,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; }