diff options
author | Steve French <sfrench@us.ibm.com> | 2005-10-31 11:36:11 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-10-31 11:36:11 -0500 |
commit | 53b2ec5518aa2623e8c0cb36f1c304a797988a46 (patch) | |
tree | 465d8631ade6c2fcbd7576ff9813d00116c6a1e8 /fs/attr.c | |
parent | 0753ca7bc2b876dd136e9db11a20f85cbe4e08b1 (diff) | |
parent | 581c1b14394aee60aff46ea67d05483261ed6527 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/attr.c')
-rw-r--r-- | fs/attr.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -117,9 +117,6 @@ int notify_change(struct dentry * dentry, struct iattr * attr) | |||
117 | struct timespec now; | 117 | struct timespec now; |
118 | unsigned int ia_valid = attr->ia_valid; | 118 | unsigned int ia_valid = attr->ia_valid; |
119 | 119 | ||
120 | if (!inode) | ||
121 | BUG(); | ||
122 | |||
123 | mode = inode->i_mode; | 120 | mode = inode->i_mode; |
124 | now = current_fs_time(inode->i_sb); | 121 | now = current_fs_time(inode->i_sb); |
125 | 122 | ||