From 5a945dea0e562ccbd7a96e61b71c4d0a4700a793 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 12 Feb 2007 00:52:24 -0800 Subject: [PATCH] --- yaml --- r: 47914 b: refs/heads/master c: 163da958ba5282cbf85e8b3dc08e4f51f8b01c5e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/read_write.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 01ff3149b052..a32ab4de0c1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a10387ec463c4fcd3ccc461291ce4d8505827e2 +refs/heads/master: 163da958ba5282cbf85e8b3dc08e4f51f8b01c5e diff --git a/trunk/fs/read_write.c b/trunk/fs/read_write.c index bcb0ef2aae3d..1f8dc373ede7 100644 --- a/trunk/fs/read_write.c +++ b/trunk/fs/read_write.c @@ -197,13 +197,13 @@ int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count struct inode *inode; loff_t pos; + inode = file->f_path.dentry->d_inode; if (unlikely((ssize_t) count < 0)) goto Einval; pos = *ppos; if (unlikely((pos < 0) || (loff_t) (pos + count) < 0)) goto Einval; - inode = file->f_path.dentry->d_inode; if (unlikely(inode->i_flock && MANDATORY_LOCK(inode))) { int retval = locks_mandatory_area( read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE,