|
@@ -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)
|