projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dmaengine-fix-4.5-rc7' of git://git.infradead.org/users/vkoul/slave-dma
[linux-2.6-block.git]
/
fs
/
utimes.c
diff --git
a/fs/utimes.c
b/fs/utimes.c
index aa138d64560a6a3c2133bc70d57e367cc8c1476d..85c40f4f373d56b3d5d41ed2fe7459759c8a3aeb 100644
(file)
--- a/
fs/utimes.c
+++ b/
fs/utimes.c
@@
-103,9
+103,9
@@
static int utimes_common(struct path *path, struct timespec *times)
}
}
retry_deleg:
}
}
retry_deleg:
-
mutex_lock(&inode->i_mutex
);
+
inode_lock(inode
);
error = notify_change(path->dentry, &newattrs, &delegated_inode);
error = notify_change(path->dentry, &newattrs, &delegated_inode);
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
if (delegated_inode) {
error = break_deleg_wait(&delegated_inode);
if (!error)
if (delegated_inode) {
error = break_deleg_wait(&delegated_inode);
if (!error)