Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5e7fc436426b1f9e106f511a049de91c82ec2c53
Commit:     5e7fc436426b1f9e106f511a049de91c82ec2c53
Parent:     7f8ada98d9edd83d6ebd01e431e15b024a4a3dc4
Author:     J. Bruce Fields <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 2 14:18:12 2007 -0400
Committer:  J. Bruce Fields <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 18:32:46 2007 -0400

    nfsd: remove IS_ISMNDLCK macro
    
    This macro is only used in one place; in this place it seems simpler to
    put open-code it and move the comment to where it's used.
    
    Signed-off-by: J. Bruce Fields <[EMAIL PROTECTED]>
---
 fs/nfsd/vfs.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 9152f87..085ded6 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -61,12 +61,6 @@
 #define NFSDDBG_FACILITY               NFSDDBG_FILEOP
 
 
-/* We must ignore files (but only files) which might have mandatory
- * locks on them because there is no way to know if the accesser has
- * the lock.
- */
-#define IS_ISMNDLK(i)  (S_ISREG((i)->i_mode) && mandatory_lock(i))
-
 /*
  * This is a cache of readahead params that help us choose the proper
  * readahead strategy. Initially, we set all readahead parameters to 0
@@ -680,7 +674,12 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int 
type,
        err = nfserr_perm;
        if (IS_APPEND(inode) && (access & MAY_WRITE))
                goto out;
-       if (IS_ISMNDLK(inode))
+       /*
+        * We must ignore files (but only files) which might have mandatory
+        * locks on them because there is no way to know if the accesser has
+        * the lock.
+        */
+       if (S_ISREG((inode)->i_mode) && mandatory_lock(inode))
                goto out;
 
        if (!inode->i_fop)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to