projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mfd: axp20x: Split the driver into core and i2c bits
[cascardo/linux.git]
/
fs
/
read_write.c
diff --git
a/fs/read_write.c
b/fs/read_write.c
index
06b07d5
..
324ec27
100644
(file)
--- a/
fs/read_write.c
+++ b/
fs/read_write.c
@@
-238,7
+238,7
@@
loff_t default_llseek(struct file *file, loff_t offset, int whence)
struct inode *inode = file_inode(file);
loff_t retval;
struct inode *inode = file_inode(file);
loff_t retval;
-
mutex_lock(&inode->i_mutex
);
+
inode_lock(inode
);
switch (whence) {
case SEEK_END:
offset += i_size_read(inode);
switch (whence) {
case SEEK_END:
offset += i_size_read(inode);
@@
-283,7
+283,7
@@
loff_t default_llseek(struct file *file, loff_t offset, int whence)
retval = offset;
}
out:
retval = offset;
}
out:
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
return retval;
}
EXPORT_SYMBOL(default_llseek);
return retval;
}
EXPORT_SYMBOL(default_llseek);
@@
-1656,6
+1656,9
@@
next_file:
mnt_drop_write_file(dst_file);
next_loop:
fdput(dst_fd);
mnt_drop_write_file(dst_file);
next_loop:
fdput(dst_fd);
+
+ if (fatal_signal_pending(current))
+ goto out;
}
out:
}
out: