diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2012-12-17 18:59:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 20:15:12 -0500 |
commit | 965c8e59cfcf845ecde2265a1d1bfee5f011d302 (patch) | |
tree | 22758a99b4ecb475750966d5202200dc0e89876c /fs/cifs | |
parent | c0f041602c33bae10b8e321c49024490d03ced3d (diff) |
lseek: the "whence" argument is called "whence"
But the kernel decided to call it "origin" instead. Fix most of the
sites.
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/cifs')
-rw-r--r-- | fs/cifs/cifsfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 210f0af83fc4..ce9f3c5421bf 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -695,13 +695,13 @@ static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
695 | return written; | 695 | return written; |
696 | } | 696 | } |
697 | 697 | ||
698 | static loff_t cifs_llseek(struct file *file, loff_t offset, int origin) | 698 | static loff_t cifs_llseek(struct file *file, loff_t offset, int whence) |
699 | { | 699 | { |
700 | /* | 700 | /* |
701 | * origin == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate | 701 | * whence == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate |
702 | * the cached file length | 702 | * the cached file length |
703 | */ | 703 | */ |
704 | if (origin != SEEK_SET && origin != SEEK_CUR) { | 704 | if (whence != SEEK_SET && whence != SEEK_CUR) { |
705 | int rc; | 705 | int rc; |
706 | struct inode *inode = file->f_path.dentry->d_inode; | 706 | struct inode *inode = file->f_path.dentry->d_inode; |
707 | 707 | ||
@@ -728,7 +728,7 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin) | |||
728 | if (rc < 0) | 728 | if (rc < 0) |
729 | return (loff_t)rc; | 729 | return (loff_t)rc; |
730 | } | 730 | } |
731 | return generic_file_llseek(file, offset, origin); | 731 | return generic_file_llseek(file, offset, whence); |
732 | } | 732 | } |
733 | 733 | ||
734 | static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) | 734 | static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) |