Commit 72bd6173 authored by Alan Cox's avatar Alan Cox Committed by Dave Jones

[PATCH] NOMMU update for fs/locks.c

Since we don't have mandatory mmap lock files we can lose this chunk
parent 9da07cd3
......@@ -1401,6 +1401,7 @@ int fcntl_setlk(struct file *filp, unsigned int cmd, struct flock *l)
inode = filp->f_dentry->d_inode;
#ifdef CONFIG_MMU
/* Don't allow mandatory locks on files that may be memory mapped
* and shared.
*/
......@@ -1413,6 +1414,7 @@ int fcntl_setlk(struct file *filp, unsigned int cmd, struct flock *l)
goto out;
}
}
#endif
error = flock_to_posix_lock(filp, file_lock, &flock);
if (error)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment