Skip to content

L
linux
Commit 42383036 authored by Alan Cox's avatar Alan Cox Committed by James Bottomley
Browse files
Options

[PATCH] mmuless no longer needs this ifdef

parent 4aa90ed7
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
fs/locks.c
View file @ 42383036
...@@ -1412,7 +1412,6 @@ int fcntl_setlk(struct file *filp, unsigned int cmd, struct flock *l) ...@@ -1412,7 +1412,6 @@ int fcntl_setlk(struct file *filp, unsigned int cmd, struct flock *l)
inode = filp->f_dentry->d_inode; inode = filp->f_dentry->d_inode;
#ifdef CONFIG_MMU
/* Don't allow mandatory locks on files that may be memory mapped /* Don't allow mandatory locks on files that may be memory mapped
* and shared. * and shared.
*/ */
...@@ -1425,7 +1424,6 @@ int fcntl_setlk(struct file *filp, unsigned int cmd, struct flock *l) ...@@ -1425,7 +1424,6 @@ int fcntl_setlk(struct file *filp, unsigned int cmd, struct flock *l)
goto out; goto out;
} }
} }
#endif
error = flock_to_posix_lock(filp, file_lock, &flock); error = flock_to_posix_lock(filp, file_lock, &flock);
if (error) 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7