MMC: OMAP: Fix timeout calculation for MMC multislot support

[linux-2.6-omap-h63xx.git] / fs / read_write.c

diff --git a/fs/read_write.c b/fs/read_write.c
index 507ddff48a9a9e673d75d161d0fc8ad09c00faef..ea1f94cc722e0c942111b9849cedf8b1aef1d86a 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -205,7 +205,7 @@ int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count
        if (unlikely((pos < 0) || (loff_t) (pos + count) < 0))
                goto Einval;
 
-       if (unlikely(inode->i_flock && MANDATORY_LOCK(inode))) {
+       if (unlikely(inode->i_flock && mandatory_lock(inode))) {
                int retval = locks_mandatory_area(
                        read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE,
                        inode, file, pos, count);
@@ -370,7 +370,7 @@ asmlinkage ssize_t sys_read(unsigned int fd, char __user * buf, size_t count)
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(sys_read);
+EXPORT_UNUSED_SYMBOL_GPL(sys_read); /* to be deleted for 2.6.25 */
 
 asmlinkage ssize_t sys_write(unsigned int fd, const char __user * buf, size_t count)
 {